commit 6807f337314448d287a10d92516817fbae1cf5f4 Merge: d0bc63e ccb9a00 Author: Georg Koppen gk@torproject.org Date: Tue Jun 23 09:39:12 2015 +0000

Merge branch 'bug_16210'

gitian/descriptors/linux/gitian-firefox.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)