Merge pull request #5640 from owncloud/backport_executeaudited_stable5

author Thomas Müller <thomas.mueller@tmit.eu>

Thu, 31 Oct 2013 17:28:49 +0000 (10:28 -0700)

committer Thomas Müller <thomas.mueller@tmit.eu>

Thu, 31 Oct 2013 17:28:49 +0000 (10:28 -0700)
author Thomas Müller <thomas.mueller@tmit.eu>
Thu, 31 Oct 2013 17:28:49 +0000 (10:28 -0700)
committer Thomas Müller <thomas.mueller@tmit.eu>
Thu, 31 Oct 2013 17:28:49 +0000 (10:28 -0700)
diff --cc lib/db.php
Simple merge
diff --cc lib/files/cache/cache.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Thu, 31 Oct 2013 17:28:49 +0000 (10:28 -0700)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Thu, 31 Oct 2013 17:28:49 +0000 (10:28 -0700)
		1	2
lib/db.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/files/cache/cache.php	patch \|	diff1 \|	diff2 \|	blob \| history