From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 15 Feb 2013 20:04:48 +0000 (+0100)
Subject: merge master into filecache_mtime
X-Git-Tag: v6.0.0alpha2~753^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2ed850e05b46d820528813c2f2415dad60c1c570;p=nextcloud-server.git

merge master into filecache_mtime
---

2ed850e05b46d820528813c2f2415dad60c1c570
diff --cc lib/util.php
index 7950586b580,b2a4fce65a2..e739f76034c
--- a/lib/util.php
+++ b/lib/util.php
@@@ -73,8 -73,9 +73,9 @@@ class OC_Util 
  	 * @return array
  	 */
  	public static function getVersion() {
- 		// hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4.90.0. This is not visible to the user
- 		return array(4, 91, 10);
+ 		// hint: We only can count up. So the internal version number
+ 		// of ownCloud 4.5 will be 4.90.0. This is not visible to the user
 -		return array(4, 92, 10);
++		return array(4, 92, 11);
  	}
  
  	/**