diff options
author | Alon Zakai <alonzakai@gmail.com> | 2012-03-06 14:15:50 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2012-03-06 14:15:50 -0800 |
commit | 56a6a6abfd94948c6fade2e1c4b8e8e38632b0ed (patch) | |
tree | a42a30fcfb60181399b285a42bb2029bd407c676 | |
parent | 4879395227fbddf3695cc550eecbe9c829701b61 (diff) | |
parent | 35e2e077d983827d7327797797ebb66025bbc205 (diff) |
Merge branch 'master' into incoming
-rw-r--r-- | AUTHORS | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -14,5 +14,4 @@ under the licensing terms detailed in LICENSE. * Julien Hamaide <julien.hamaide@gmail.com> * Ehsan Akhgari <ehsan.akhgari@gmail.com> (copyright owned by Mozilla Foundation) * Adrian Taylor <adrian@macrobug.com> - - +* Richard Assar <richard.assar@gmail.com> |