[tor-commits] [torbirdy/master] Merge branch 'master' of github.com:ioerror/torbirdy

[sukhbir at torproject.org]

commit a14e732892fb7a9138b62da641e6404018524689
Merge: 34907e6 b15dbf7
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Sat Sep 21 19:48:30 2013 -0400

    Merge branch 'master' of github.com:ioerror/torbirdy

 chrome/locale/nl/torbirdy.dtd |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)