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

[isis at torproject.org]

commit ddc034a7a2d64a9aa995279b18be710f186dc6a4
Merge: 01f90b1 6db3d02
Author: Isis Lovecruft <isis at torproject.org>
Date:   Mon Aug 17 01:10:14 2015 +0000

    Merge branch 'trac-16827'

 src/js/templates/summarySearch.hbs |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)