Merge branch 'master' of ssh://openpandora.org/srv/git/pandora-libraries
authorsebt3 <sebastien.huss@gmail.com>
Mon, 13 Jun 2011 13:34:31 +0000 (09:34 -0400)
committersebt3 <sebastien.huss@gmail.com>
Mon, 13 Jun 2011 13:34:31 +0000 (09:34 -0400)
commitf46578471aec39b3587251962ebf0b6284f16cfa
tree5e9228e8e8fb63c655dd1e1ca2e1bb2f1c95e949
parent2b5fb03d93425476676e74e6b9792b05b6f3b929
parent6838a027179b410438dc4f75d41938e35328d77c
Merge branch 'master' of ssh://openpandora.org/srv/git/pandora-libraries