Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries
authorskeezix <skeezix@flotsam-vm.(none)>
Mon, 30 Aug 2010 01:47:09 +0000 (21:47 -0400)
committerskeezix <skeezix@flotsam-vm.(none)>
Mon, 30 Aug 2010 01:47:09 +0000 (21:47 -0400)
commit3980a0e5d37ed5822dc8c305718b247487d4d58b
treec40de69ecd8b9e25b990f59b3a12e47955e4ca2a
parent1a824f3029adea23e74ce2d5bae82a31df65818f
parent8dfec2f8c478b96ae647a64ac3b0f730da4c74bd
Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries