[tor-commits] [torbutton/master] Merge remote-tracking branch 'gk/bug_16427'

[mikeperry at torproject.org]

commit bdf2289fdcf4485a16ade68b51cbd6532ef460b9
Merge: d379c3e 2b9497e
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Jun 24 19:48:03 2015 -0700

    Merge remote-tracking branch 'gk/bug_16427'

 src/install.rdf |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)