Merge "mediawiki.Uri: Optional url use default location."
authorKrinkle <ttijhof@wikimedia.org>
Thu, 26 Jul 2012 17:20:59 +0000 (17:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 26 Jul 2012 17:20:59 +0000 (17:20 +0000)

Trivial merge