Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline into 1.0.x
authorSiebrand Mazeland <s.mazeland@xs4all.nl>
Fri, 18 Mar 2011 15:09:27 +0000 (16:09 +0100)
committerSiebrand Mazeland <s.mazeland@xs4all.nl>
Fri, 18 Mar 2011 15:09:27 +0000 (16:09 +0100)
commitb7178d2197d225b5fcb605b1c4d9df14d8b278a1
treee40111ce556f147c9a90f5f2210bc7fa8b49a9ad
parent0de0ae2f48837c4dbb8fe2787fdcb42b5866cba9
parent90a7631592858f5ac2c46e459e04b541960a9a30
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline into 1.0.x