summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-23 12:13:32 -0700
committerBrion Vibber <brion@pobox.com>2010-03-23 12:13:32 -0700
commit7277b59734cf0e39c8c77e01b13e8d997533bacf (patch)
tree18bc14d3ead88c649328c8354a3690b1c2491260 /Makefile
parentfcdbf421ab2bbbe4d1b601a8c80d4612c91f62fe (diff)
parent44caa3a93f452777c795006edb52ef4c5c2c4997 (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions