[tor-commits] [globe/master] Merge branch 'trac-15451'

[isis at torproject.org]

commit 3a92fbab5526599970e620bb7646baa1e824206f
Merge: f46b370 02b8a91
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu May 21 09:50:01 2015 +0000

    Merge branch 'trac-15451'

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