Merge branch 'master' of github.com:wikimedia/limn.wiki
authordsc <dsc@less.ly>
Thu, 19 Jul 2012 17:44:52 +0000 (10:44 -0700)
committerdsc <dsc@less.ly>
Thu, 19 Jul 2012 17:44:52 +0000 (10:44 -0700)

Trivial merge