Merge branch 'johan-gitorious/master'
authorBruno Azisaka Maciel <bruno.azisaka@gmail.com>
Sun, 12 Oct 2008 22:33:13 +0000 (20:33 -0200)
committerBruno Azisaka Maciel <bruno.azisaka@gmail.com>
Sun, 12 Oct 2008 22:33:13 +0000 (20:33 -0200)
commit6988afbc18b08904256aa0a7d2fdde5749e94d7d
tree7588a0564f2d579553bd9e2de21f88bca2c9deed
parentd8d28f8c4f5afba7e577dde78c436e91f26f3877
parentc967b89be7b17127105578326afb9adc56d8583e
Merge branch 'johan-gitorious/master'