Merge remote-tracking branch 'upstream/master' into social-master
authorRoland Haeder <roland@mxchange.org>
Sun, 7 Feb 2016 13:30:44 +0000 (14:30 +0100)
committerRoland Haeder <roland@mxchange.org>
Sun, 7 Feb 2016 13:30:44 +0000 (14:30 +0100)
1  2 
lib/default.php

diff --cc lib/default.php
Simple merge