summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-03-17 09:38:39 -0500
committerEvan Prodromou <evan@status.net>2010-03-17 09:38:39 -0500
commit4761c07ad8d76f7c34d4db53d32d15e806ba1e88 (patch)
treeeb3d78ccde1778037165c92b6ec36c7465b54345 /Makefile
parentf21f78364a9cbde2ca535a3983b384707ad097ae (diff)
parentf62b8a80cf33ac8529d0736c51dc060a9d235369 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions