From: sebt3 <sebastien.huss@gmail.com>
Date: Mon, 13 Jun 2011 13:34:31 +0000 (-0400)
Subject: Merge branch 'master' of ssh://openpandora.org/srv/git/pandora-libraries
X-Git-Tag: sz_beta3~44
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f46578471aec39b3587251962ebf0b6284f16cfa;p=pandora-libraries.git

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

f46578471aec39b3587251962ebf0b6284f16cfa