Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
authorEvan Prodromou <evan@status.net>
Sun, 17 Jun 2012 13:53:45 +0000 (09:53 -0400)
committerEvan Prodromou <evan@status.net>
Sun, 17 Jun 2012 13:53:45 +0000 (09:53 -0400)
commit97099e08c5a932a95cab55a3142edb361bd3a9a1
tree07f1f72d1da5daa918accc0f074c4204faa1b40a
parentf5af67ce68e827d26d24d07fd02a51aff6aef633
parentc658ede37c62457487eb62faa4b9ebf150da20a4
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x