From: vimacs <vimacs@pndtest>
Date: Sun, 15 Nov 2009 05:33:00 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openpandora.org/pandora-libraries
X-Git-Tag: Release-2010-05/1~148
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68e9a319811e5bb68691a1246abfb439cf29bd18;p=pandora-libraries.git

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

68e9a319811e5bb68691a1246abfb439cf29bd18