[tor-commits] [globe/master] Merge remote-tracking branch 'Syrup-tan/trac-12933'

[isis at torproject.org]

commit b03048a88210f4bccf1c16a301775e68523b34c1
Merge: 8411f2a b7ad9c0
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Nov 12 22:55:24 2014 +0000

    Merge remote-tracking branch 'Syrup-tan/trac-12933'

 src/html/index.raw.html    |    2 +-
 src/js/templates/index.hbs |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)