commit c836fa07a5eb60af171200554ec43021f5a7310b Merge: fa67d20 31956f6 Author: Isis Lovecruft <isis@torproject.org> Date: Fri Feb 21 23:25:17 2014 +0000 Merge branch 'hotfix/9264_2_rtl-2step' into develop lib/bridgedb/templates/index.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)