From 434748b876907917dcf2e75d8475779ec25e47dd Mon Sep 17 00:00:00 2001
From: Robert Kolner <robert.kolner@gmail.com>
Date: Tue, 27 Mar 2012 10:47:43 +0200
Subject: [PATCH] Merge branches 'master' and 'master' of
 git.assembla.com:oliver-tetris