Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
authorEvan Prodromou <evan@status.net>
Tue, 24 Apr 2012 01:02:22 +0000 (21:02 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 24 Apr 2012 01:02:22 +0000 (21:02 -0400)
commit482b80cb0c2c9874ede157f3f9eb7616efccbe11
treecb9053dfff97cfeb4acc52abe7ffaaa4a46ff131
parent2eed1e2ae26d2e9b9429c7c941adc3c6be80a5b1
parent3898500ff9fed71561b75ca3dc92c780dd617171
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x