From 899e306cee81c355f0486cc33197fd5d42feb2bf Mon Sep 17 00:00:00 2001
From: Saebekassebil <saebekassebil@gmail.com>
Date: Mon, 30 Jul 2012 15:08:54 +0200
Subject: [PATCH] Merge branch 'mozilla', remote-tracking branch
 'origin/master' into mozilla