[tor-commits] [webwml/staging] Merge branch 'master' into staging

[sebastian at torproject.org]

commit c8d45d4a02dfde72f5cbc119b05c51b4167dc407
Merge: 1f532ec d1f6a0c
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Mon Nov 17 00:51:59 2014 +0100

    Merge branch 'master' into staging

 images/icon-TorBirdy.jpg |  Bin 3239 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)