[tor-commits] [tor-browser-bundle/master] Merge branch gk's 'bug_11249_1' into bug_11249

[gk at torproject.org]

commit 11323895a3e8ddc55ba0d479442c1e7163884404
Merge: dbb4f9a a6b7b0d
Author: Linus Nordberg <linus at nordberg.se>
Date:   Fri May 30 14:06:16 2014 +0200

    Merge branch gk's 'bug_11249_1' into bug_11249

 tools/continuous-builds/build-tbb.sh |    2 ++
 1 file changed, 2 insertions(+)