[tor-commits] [webwml/staging] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

[arma at torproject.org]

commit abb69c55fb4b43ca9612ac833b2d01f7f0d5c794
Merge: c106733 02a1457
Author: Andrew Lewman <andrew at torproject.is>
Date:   Wed Nov 19 10:00:51 2014 -0500

    Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 include/versions.wmi       |    2 +-
 projects/en/torbrowser.wml |   62 ++++++++++++++++++++++----------------------
 2 files changed, 32 insertions(+), 32 deletions(-)