Merge remote-tracking branch 'upstream/master' into social-master
authorRoland Haeder <roland@mxchange.org>
Wed, 6 May 2015 07:09:31 +0000 (09:09 +0200)
committerRoland Haeder <roland@mxchange.org>
Wed, 6 May 2015 07:09:31 +0000 (09:09 +0200)
commit88055f52e6af1f49e6a0e0a03f1dcb0c2607102b
treef0ece6a00986c161872ef92c0218e01373687177
parentb53e1439969bfa2c0b551d8cc2fc8fe15652c62a
parente4a17fedc64b4519434ccec9262149bdb330d4af
Merge remote-tracking branch 'upstream/master' into social-master
classes/File_thumbnail.php
lib/default.php