Merge "API: Overhaul token handling"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 26 Aug 2014 19:09:21 +0000 (19:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 26 Aug 2014 19:09:21 +0000 (19:09 +0000)
1  2 
RELEASE-NOTES-1.24
docs/hooks.txt
includes/AutoLoader.php

Simple merge
diff --cc docs/hooks.txt
Simple merge
Simple merge