summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-01-13 21:13:21 +0000
committerSarven Capadisli <csarven@status.net>2010-01-13 21:13:21 +0000
commit25ed2d2c872e59fd99b54fdf0dec1ca448feca00 (patch)
tree8d882d0d647b09ec2e060d0bdb20646b8a505cf1 /Makefile
parent5d88e6435f5b6725c09480a7d7cd4a8a80a62202 (diff)
parentd018ab7b0ce907a2400d7cd2294362e4d85f4717 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions