Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries
authorskeezix <skeezix@flotsam-vm.(none)>
Wed, 25 Aug 2010 02:42:53 +0000 (22:42 -0400)
committerskeezix <skeezix@flotsam-vm.(none)>
Wed, 25 Aug 2010 02:42:53 +0000 (22:42 -0400)
commit116c9ef6cae2f1f38a2f9f5987ecbcee63785564
tree8ea83352dfe0b52ef2aeaffac191ee301fb9cc8d
parent2b27077cfb520fc5ad87b9bddf255f359a760b89
parent21b20e83b8be60bcd867abe40f00744c72d77aa9
Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries