Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Sat, 17 Sep 2011 21:00:49 +0000 (17:00 -0400)
committerEvan Prodromou <evan@status.net>
Sat, 17 Sep 2011 21:00:49 +0000 (17:00 -0400)
commit4d09d3c68036d2ec7137c4d60f43ec5e2267093f
tree1810f94b9e61cf2de18e0d2fcb28ecaa6ba5358f
parent945bdf649be19962dc9f578036dcc83fe334ee9c
parentb34812152d0a4f9bc9f86cd96ab7c3c98939619e
Merge branch 'master' of gitorious.org:statusnet/mainline