256 commits

Author	SHA1	Message	Date
Bart Visscher	a90ea2c069	Merge remote-tracking branch 'origin/master' into setup	2013-10-02 18:23:59 +02:00
Bjoern Schiessle	8b08b1b455	Merge branch 'master' into sharing_mail_notification_master ... Conflicts: lib/private/util.php	2013-10-02 10:11:18 +02:00
Thomas Müller	9eab8b39df	Merge branch 'master' into fixing-4620-master	2013-10-01 22:57:46 +02:00
Thomas Müller	e2fe71b6e7	Merge branch 'master' into lib-private-master-2	2013-10-01 16:11:59 +02:00
Thomas Müller	02d6976263	Merge branch 'master' into lib-private-master-2	2013-09-30 21:29:58 +02:00
Thomas Müller	9c9dc276b7	move the private namespace OC into lib/private - OCP will stay in lib/public ... Conflicts: lib/private/vcategories.php	2013-09-30 16:36:59 +02:00

Renamed from lib/util.php (Browse further)