2 Commits (67779680a67f88c9ff4017ca91fa952dab0946b2)

Author	SHA1	Message	Date
Bjoern Schiessle	8b08b1b455	Merge branch 'master' into sharing_mail_notification_master ... Conflicts: lib/private/util.php	2013-10-02 10:11:18 +07: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 +07:00