Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Mon, 16 Apr 2012 19:43:28 +0000 (15:43 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 16 Apr 2012 19:43:28 +0000 (15:43 -0400)
commit347ba8c4a3fdcd4f93cde27ecec21c8f68fd4425
tree78f5eaf40ac2e4c338bda27e7fe2b050adc0cdc9
parent1fdb539b488a25ba8018affbf3dd2cf81b5dd615
parent35521d4a5b9aacbc377de8f9bc73156beed66d49
Merge branch 'master' of gitorious.org:statusnet/mainline