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

commit fc6478c74d0f541797c4d592c4e5095799e2ce92 Merge: 684578d a1ae777 Author: Andrew Lewman <andrew@torproject.is> Date: Tue Jan 6 11:47:35 2015 -0500 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml about/en/gsoc.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)