Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Mon, 20 Feb 2012 15:59:14 +0000 (10:59 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 20 Feb 2012 15:59:14 +0000 (10:59 -0500)
commit14feccdf7c3028342f144119e2e0756ea7e646d0
tree20a8670e24ecc26a7805bfe3e1570cfeaadc944f
parent183ffce78f9c538cb8398d69eaca41214db86ecf
parent710febfba16d19e0ca46a88ffcb16eb6b5521be2
Merge branch 'master' of gitorious.org:statusnet/mainline