summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-01-31 23:42:19 +0100
committerSarven Capadisli <csarven@status.net>2010-01-31 23:42:19 +0100
commit7558e2fd61c527b31b5a49d29a59b6b0b1d6d542 (patch)
tree4f71863c12f8b20b261dad09496f65ca872f5712 /Makefile
parent4d0ee6a41f3cfb2e99dcb92e7b14f3183393f1a5 (diff)
parent81087e45c5b797028e90181459e4c673cd7be278 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions