Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Sat, 17 Sep 2011 22:27:37 +0000 (18:27 -0400)
committerEvan Prodromou <evan@status.net>
Sat, 17 Sep 2011 22:27:37 +0000 (18:27 -0400)
commit1040f1346c4660d37b03b76d478d0eaac260373c
treef8b2855f81f5f4ba14e2bc462b3c22ef2d4ec174
parent5c0e8d2a2f3e55b7315511e806f40b6dea69f9ea
parent985f52ce6097816f2fd9fc07bf2c051e59db4750
Merge branch 'master' of gitorious.org:statusnet/mainline