Thomas Müller 053b55721d Merge branch 'master' into fixing-appframework-master 11 anni fa
..
factory.php 3829a746a1 moving file to the right location 11 anni fa
string.php 9c9dc276b7 move the private namespace OC into lib/private - OCP will stay in lib/public 11 anni fa