commit baa57e39a0bb020d7db1bd7b9bb43d0510c620cb Merge: 91d79dd 4ac2940 Author: Andrew Lewman andrew@torproject.is Date: Tue Mar 17 13:17:18 2015 -0400

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

Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)