summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-02-02 23:17:58 +0000
committerZach Copley <zach@status.net>2010-02-02 23:17:58 +0000
commitdd1b8076d828384ebea51d8acfe518893681e574 (patch)
tree126d9b5c9d5992591983f2c4b5e7b1263773363a /Makefile
parent2085b506d4d4e6291156662f5930596bc657f270 (diff)
parent027c7e61fd6ecbb866a4f18111662902942d046e (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions