Merge "Fix magic $ aliasing in ResourceLoader"
authorAaron Schulz <aschulz@wikimedia.org>
Mon, 23 Apr 2012 19:21:22 +0000 (19:21 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 23 Apr 2012 19:21:22 +0000 (19:21 +0000)

Trivial merge