Merge "Trim trailing whitespace"
authorAaron Schulz <aschulz@wikimedia.org>
Thu, 22 Mar 2012 00:20:21 +0000 (00:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 22 Mar 2012 00:20:21 +0000 (00:20 +0000)

Trivial merge