Merge remote-tracking branch 'statusnet/180' into statusnet_1.1.x
authorJean Baptiste Favre <statusnet@jbfavre.org>
Tue, 18 Sep 2012 22:07:29 +0000 (00:07 +0200)
committerJean Baptiste Favre <statusnet@jbfavre.org>
Tue, 18 Sep 2012 22:07:29 +0000 (00:07 +0200)
commit0b53b6768e03932f4beec6b6655763e6ecedc36d
treef2ababd6c175d059f61a52046ac847bdba2a2a6c
parentf21881d5faddd56f57f52dc1a1f699c3dc9518e3
parentf57a35a9165b486c9fb5078371bac6e36f5254f8
Merge remote-tracking branch 'statusnet/180' into statusnet_1.1.x