From: Michael Mrozek Date: Sat, 28 May 2011 01:33:34 +0000 (+0200) Subject: Merge branch 'master' of git://openpandora.org/openpandora.oe X-Git-Tag: sz_beta3~157 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dbb024a38bbfccc827b8da8144c0c5c3becaa81;p=openpandora.oe.git Merge branch 'master' of git://openpandora.org/openpandora.oe --- 3dbb024a38bbfccc827b8da8144c0c5c3becaa81