Merge remote-tracking branch 'esr/master'
authorW. Trevor King <wking@tremily.us>
Fri, 2 Aug 2013 17:51:52 +0000 (10:51 -0700)
committerW. Trevor King <wking@tremily.us>
Fri, 2 Aug 2013 17:51:52 +0000 (10:51 -0700)
commitdcbdaba0806b27fbe8f6a3e9b5ca7d18919be866
treeb358c59b895ddc57080ed1a226ded0feacb8cab6
parent61ac4eee6a137983b9561ad33342197c8278bdbd
parent8ed1da9ec402f8e46c82a3cdcdf1c35bc6795245
Merge remote-tracking branch 'esr/master'

* esr/master:
  Typo fix.