Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 25 Aug 2011 22:03:30 +0000 (18:03 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 25 Aug 2011 22:03:30 +0000 (18:03 -0400)
commitc0bae505d91620b4af14431bc6fe706d84013f16
treee5fe96ed6ccc4007f597786853449aa4fa3f533d
parent44a46de7ffd6a6a45689ecf423a4baa179248388
parent8ea5cd0cac762e99bdec69e6ec5ad5bdf1e14150
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
lib/action.php
plugins/Activity/ActivityPlugin.php