From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 2 Jun 2013 18:12:44 +0000 (+0200)
Subject: merge master into backgroundjob
X-Git-Tag: v6.0.0alpha2~695^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=251527c6e65a5f88b56c2dbcfebb7d8dbe38d8fb;p=nextcloud-server.git

merge master into backgroundjob
---

251527c6e65a5f88b56c2dbcfebb7d8dbe38d8fb
diff --cc lib/util.php
index b3fab5041f2,035815c057f..95af22ed0ee
--- a/lib/util.php
+++ b/lib/util.php
@@@ -75,7 -80,7 +80,7 @@@ class OC_Util 
  	public static function getVersion() {
  		// hint: We only can count up. Reset minor/patchlevel when
  		// updating major/minor version number.
- 		return array(5, 80, 03);
 -		return array(5, 80, 04);
++		return array(5, 80, 05);
  	}
  
  	/**