Merge changes Ic0eaac33,Iaa81af5b
authorBrian Wolff <bawolff+wn@gmail.com>
Thu, 5 Dec 2013 20:54:06 +0000 (20:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 5 Dec 2013 20:54:06 +0000 (20:54 +0000)
commitaf4f9339b2e7c30d9750bc606e5662798bf83d19
treecc77981a74ef5bf3070c0bac77d5938bdf5a45ee
parent7da01863dc7003dbca4fc019ed0f1dd082fed777
parentd39ad9ea64ff043b6cfb91c98ab32a0bc285ccc0
Merge changes Ic0eaac33,Iaa81af5b

* changes:
  Remove PHP4 style constructor
  Update formatting for media related classes