Merge remote-tracking branch 'jbfavre/master' into activity_base_mod
authorMikael Nordfeldth <mmn@hethane.se>
Mon, 17 Jun 2013 09:18:24 +0000 (11:18 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Mon, 17 Jun 2013 09:18:24 +0000 (11:18 +0200)
commita7e6308f5f18f760b70481baf6265fa5aa288d8d
tree9a0702d98658453478d85a5c28932355a22be2bf
parent248daf41b47374e9026275e10bcdc1d2f48b653d
parent8b5023188ff6cfa37d68c9bc644d36760c1a6a17
Merge remote-tracking branch 'jbfavre/master' into activity_base_mod

Conflicts:
actions/apistatusesupdate.php
classes/Message.php
classes/Notice.php
lib/util.php
plugins/Bookmark/BookmarkPlugin.php
plugins/ClientSideShorten/ClientSideShortenPlugin.php
plugins/InfiniteScroll/InfiniteScrollPlugin.php
plugins/InfiniteScroll/infinitescroll.js
plugins/ModPlus/remoteprofileaction.php
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
plugins/TwitterBridge/tweetinqueuehandler.php
plugins/TwitterBridge/twitterimport.php
plugins/TwitterBridge/twitteroauthclient.php
actions/apistatusesupdate.php
lib/activityobject.php
plugins/Bookmark/BookmarkPlugin.php
plugins/TwitterBridge/twitterimport.php
plugins/TwitterBridge/twitteroauthclient.php