From: Brian Wolff <bawolff+wn@gmail.com>
Date: Thu, 5 Dec 2013 20:54:06 +0000 (+0000)
Subject: Merge changes Ic0eaac33,Iaa81af5b
X-Git-Tag: 1.31.0-rc.0~17770
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=af4f9339b2e7c30d9750bc606e5662798bf83d19;p=lhc%2Fweb%2Fwiklou.git

Merge changes Ic0eaac33,Iaa81af5b

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

af4f9339b2e7c30d9750bc606e5662798bf83d19