From: Michael Mrozek Date: Tue, 7 Jun 2011 10:24:25 +0000 (+0200) Subject: Merge branch 'master' of git://openpandora.org/openpandora.oe X-Git-Tag: sz_beta3~155 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc8fee9bc588e869077ecfe8504116b129ecd412;p=openpandora.oe.git Merge branch 'master' of git://openpandora.org/openpandora.oe --- bc8fee9bc588e869077ecfe8504116b129ecd412