Merge branch 'master' of gitorious.org:parrot-plumage/parrot-plumage
authorDaniel Arbelo Arrocha <arbelo@gmail.com>
Wed, 21 Oct 2009 23:48:30 +0000 (21:48 -0200)
committerDaniel Arbelo Arrocha <arbelo@gmail.com>
Wed, 21 Oct 2009 23:48:30 +0000 (21:48 -0200)
commit968202b41ede3f0cb3e2fc37704e34024e09d7b8
tree7c1aa6b2eb36d3163c15cbefb5cc3452de3d9f37
parentd2daca127c43b23339ab44563b5a91d39d9d156f
parent973112df6eecd60b3eb93a5c36eaa421793539f4
Merge branch 'master' of gitorious.org:parrot-plumage/parrot-plumage