Merge "Return empty string for trail/prefix if disabled"
authorMark Holmquist <mtraceur@member.fsf.org>
Tue, 5 Mar 2013 23:53:11 +0000 (23:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 5 Mar 2013 23:53:11 +0000 (23:53 +0000)

Trivial merge