Merge branch 'master' of git://gitorious.org/statusnet/mainline into activity_base_mod
authorMikael Nordfeldth <mmn@hethane.se>
Wed, 26 Jun 2013 09:18:22 +0000 (11:18 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Wed, 26 Jun 2013 09:18:22 +0000 (11:18 +0200)
commitfec8ced00aab1105ed06fd6d2c2f35ad6f28e810
tree08622154bb3646aff48418c7951de279ce8f5cbb
parentafc6b64f67bdc22084adaa497a1991b393639402
parent557105b86d569de1da53ea6a4ba217a006e225ca
Merge branch 'master' of git://gitorious.org/statusnet/mainline into activity_base_mod

Conflicts:
actions/apistatusesupdate.php
lib/activity.php
lib/siteprofile.php
15 files changed:
lib/activity.php
lib/activityobject.php
lib/util.php
plugins/Activity/ActivityPlugin.php
plugins/Favorite/widgets/favorite.php
plugins/Login/actions/login.php
plugins/Login/widgets/login.php
plugins/Settings/SettingsPlugin.php
plugins/Share/widgets/share.php
plugins/SocialAPI/SocialAPIPlugin.php
plugins/ThemeManager/classes/ThemeManager.php
plugins/ThemeManager/classes/ThemeSite.php
plugins/ThemeManager/classes/widgets/notice.php
plugins/XmppChat/classes/XmppPrebindSession.php
scripts/install_cli.php