commit c4f7d23bd16e47db0c7b4fca7640556c6c50bb8d Merge: 7ea8c12 5f76c46 Author: Sebastian Hahn sebastian@torproject.org Date: Tue Oct 28 09:49:12 2014 +0100

Merge branch 'master' into staging

en/index.wml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)