Merge changes Ic7725e27,Ib3d54bfa into cayuga
commitf3538f2b81575068a60d2202aa23dff0d9c84282
authorJohn Koleszar <jkoleszar@google.com>
Wed, 3 Aug 2011 20:45:24 +0000 (3 13:45 -0700)
committerCode Review <code-review@webmproject.org>
Wed, 3 Aug 2011 20:45:24 +0000 (3 13:45 -0700)
tree6cadf9fe0a4559570c3a1455ce7c5b3c8bf6675b
parenta49b9e00145e3345f96d89a2e369bdd29e3b1616
parentb956f2ceb23eabef20fe1af4142dd5a9f6a38035
Merge changes Ic7725e27,Ib3d54bfa into cayuga

* changes:
  Update AUTHORS
  Update .mailmap entry for Ralph Giles