summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-01-15 09:52:50 -0800
committerBrion Vibber <brion@pobox.com>2010-01-15 09:52:50 -0800
commitef016dca45b17e7a9e8aae17ffe1b5caf0e2694c (patch)
tree3fe3b0a03aa1034d03618167432481f321804138 /Makefile
parenta27aef92060277120f8889136ed6972f5915709f (diff)
parent038287c1ffb71207f8028014f20005483364956d (diff)
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions