commit cc71355d6b3cf82259de52aae296256d6947f257 Merge: 6e50a26 086abcf Author: Roger Dingledine <arma@torproject.org> Date: Wed Dec 10 13:07:31 2014 -0500 Merge branch 'staging' about/en/jobs-projectcoordinator.wml | 118 +-------------------------------- about/en/jobs-projectmanager.wml | 120 ++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 116 deletions(-)