commit 393bc2fec7ecefa5e89c843a31308aecaa9ec00f Merge: f435fd9 08482db Author: Sebastian Hahn sebastian@torproject.org Date: Tue Nov 11 05:02:58 2014 +0100

Merge branch 'master' into staging

about/en/corepeople.wml | 4 ---- getinvolved/en/volunteer.wml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-)