Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 1 Dec 2013 23:50:06 +0000 (00:50 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 1 Dec 2013 23:50:06 +0000 (00:50 +0100)
commitdfa4cfc7cde6c6f755beae5818fe3eee99724c5c
tree0cbbc802c454323ab4d530418f14cb6a043733bb
parentb2abeb50be91c6f62f6c77316c0c872a945ab339
parent7c1809b3b5262018fc53b77a3a5be2307c406071
Merge remote-tracking branch 'upstream/master'

Conflicts:
twitter/twitter.php
twitter/twitter.php