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)
* changes:
  Remove PHP4 style constructor
  Update formatting for media related classes


Trivial merge