Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
authorEvan Prodromou <evan@status.net>
Tue, 3 Jul 2012 16:27:10 +0000 (12:27 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 3 Jul 2012 16:27:10 +0000 (12:27 -0400)
commit06b6b5fbc25135474282775e35671240f77e51e5
treeb03acb72b60b43d739d1cefb2accee502a2f5f91
parentae84e8f5245256867fd7f5538b39fee8bb8fb970
parent51b28eda19d632e6d6deb5ce6950ca014197370a
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x