[tor-commits] [tor-browser-bundle/master] Merge ln5's branch 'tools2'

[gk at torproject.org]

commit 70d8786976abd9f39b6e19851724e74fc681cd92
Merge: 8031a8d 75bc254
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Apr 14 09:24:43 2014 +0000

    Merge ln5's branch 'tools2'

 tools/continuous-builds/build-tbb.sh |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)