From: Simon Schubert <2@0x2c.org>
Date: Tue, 15 Nov 2011 21:44:08 +0000 (+0100)
Subject: Merge commit 'refs/merge-requests/3' of git://gitorious.org/dma/dma
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=804be35c0d56a8c9cd54ce90f6d8e0d909f1a423;p=people%2Fms%2Fdma.git

Merge commit 'refs/merge-requests/3' of git://gitorious.org/dma/dma
---

804be35c0d56a8c9cd54ce90f6d8e0d909f1a423