From: David-John Willis <John.Willis@Distant-earth.com>
Date: Tue, 18 May 2010 08:23:19 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openpandora.org/openpandora.oe
X-Git-Tag: Release-2010-05/1~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=168904f737a5e82f7192534335a0860761a2aaba

Merge branch 'master' of git://git.openpandora.org/openpandora.oe
---

168904f737a5e82f7192534335a0860761a2aaba