Merge ordering fixes and PHP cleanups
authorKonrad Rosenbaum <konrad@silmor.de>
Sun, 27 Sep 2015 15:57:05 +0000 (17:57 +0200)
committerKonrad Rosenbaum <konrad@silmor.de>
Sun, 27 Sep 2015 15:57:05 +0000 (17:57 +0200)
commit2a66e0beda1f6494a61b940b46dc22a192ccdadc
tree94d89783be8dc786d99b3a83d76bc28fdac2e79a
parent95411897493c93efbee7d38f2b1e4fe6585aa6e2
parentcbf94fdddd245e6d849058a456212a0294e9f3eb
Merge ordering fixes and PHP cleanups