[tor-commits] [webwml/staging] Merge branch 'master' of https://github.com/mttp/webwml

[sebastian at torproject.org]

commit 1b0bde35cc14cc6ca67309fe28a4adf84f3b3740
Merge: d144128 dd56c8c
Author: Matt Pagan <matt at pagan.io>
Date:   Sat Dec 20 07:28:49 2014 -0600

    Merge branch 'master' of https://github.com/mttp/webwml

 download/en/download-unix.wml |    2 +-
 download/en/download.wml      |    2 +-
 include/links.wmi             |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)