Merge "Fixes bug 4045 by adding dirmarks."
authorBrion VIBBER <brion@wikimedia.org>
Fri, 20 Apr 2012 16:20:05 +0000 (16:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 20 Apr 2012 16:20:05 +0000 (16:20 +0000)

Trivial merge