Merge remote branch 'upstream/master'

Conflicts:
	update.php

diff --cc database.sql
Simple merge

diff --cc update.php
index f98fb3ae714198810ca2b68e6505cde51e2f8297,9442f825bb34fb3cefe53f8241f51115b9b0ea75..19e6cf3bdf78c06eae128ee1f383eb4f902d3492
--- 1/update.php
--- 2/update.php
+++ b/update.php
@@@ -1336,3 -1336,11 +1336,10 @@@ function update_1152() 
                return UPDATE_FAILED;
        return UPDATE_SUCCESS;
  }
 -
+ 
+ function update_1153() {
+       $r = q("ALTER TABLE `hook` ADD `priority` INT(11) UNSIGNED NOT NULL DEFAULT '0'");
+       
+       if(!$r) return UPDATE_FAILED;
+       return UPDATE_SUCCESS;
+ }