Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
Conflicts: classes/Memcached_DataObject.php
Showing
We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.
Conflicts: classes/Memcached_DataObject.php