Merge pull request #13654 from oparoz/tmpfile-with-extension

author Vincent Petry <pvince81@owncloud.com>

Thu, 26 Mar 2015 22:08:08 +0000 (23:08 +0100)

committer Vincent Petry <pvince81@owncloud.com>

Thu, 26 Mar 2015 22:08:08 +0000 (23:08 +0100)
author Vincent Petry <pvince81@owncloud.com>
Thu, 26 Mar 2015 22:08:08 +0000 (23:08 +0100)
committer Vincent Petry <pvince81@owncloud.com>
Thu, 26 Mar 2015 22:08:08 +0000 (23:08 +0100)
diff --cc lib/private/preview/office.php
Simple merge
diff --cc lib/private/tempmanager.php
Simple merge
author	Vincent Petry <pvince81@owncloud.com>
	Thu, 26 Mar 2015 22:08:08 +0000 (23:08 +0100)
committer	Vincent Petry <pvince81@owncloud.com>
	Thu, 26 Mar 2015 22:08:08 +0000 (23:08 +0100)
		1	2
lib/private/preview/office.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/tempmanager.php	patch \|	diff1 \|	diff2 \|	blob \| history