From 762a88cd6a95ed772bfef50907a89be84b2167d2 Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Fri, 30 Sep 2011 20:06:17 +0200
Subject: [PATCH] Merge branches 'multi-tag' and 'master'