[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'arthur/13313+4'

[gk at torproject.org]

commit 08b05d52c58c03e1a0c712dc64845185e53abe37
Merge: 83e881b bdc340e
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Jul 28 17:09:10 2015 +0000

    Merge remote-tracking branch 'arthur/13313+4'

 Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt   |   92 +++++++++++
 Bundle-Data/Docs/Licenses/Noto-Fonts.txt      |  201 +++++++++++++++++++++++++
 gitian/descriptors/linux/gitian-bundle.yml    |   15 ++
 gitian/descriptors/linux/gitian-firefox.yml   |    2 +-
 gitian/descriptors/mac/gitian-bundle.yml      |   15 ++
 gitian/descriptors/mac/gitian-firefox.yml     |    2 +-
 gitian/descriptors/windows/gitian-bundle.yml  |   15 ++
 gitian/descriptors/windows/gitian-firefox.yml |    2 +-
 gitian/fetch-inputs.sh                        |    5 +-
 gitian/mkbundle-linux.sh                      |    2 +-
 gitian/mkbundle-mac.sh                        |    2 +-
 gitian/mkbundle-windows.sh                    |    2 +-
 gitian/verify-tags.sh                         |    3 +-
 gitian/versions                               |    5 +
 gitian/versions.alpha                         |    5 +
 gitian/versions.beta                          |    5 +
 gitian/versions.nightly                       |    5 +
 17 files changed, 369 insertions(+), 9 deletions(-)