commit 5a9179b065e3015381fc6ea5bf4dccb0b04d3dd6 Merge: 4cce67a bb029bf Author: Georg Koppen gk@torproject.org Date: Tue Mar 24 15:43:19 2015 +0000

Merge remote-tracking branch 'arthur/14937'

Bundle-Data/PTConfigs/bridge_prefs.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)