Merge remote-tracking branch 'origin/fixes-kuadrosx' into fixes-patcito
authorPatrick Aljord <patcito@gmail.com>
Sun, 9 Oct 2011 23:16:32 +0000 (18:16 -0500)
committerPatrick Aljord <patcito@gmail.com>
Sun, 9 Oct 2011 23:16:32 +0000 (18:16 -0500)
commit9b2c4e28c6ccc6f48f00855c050faf0c53ee2e93
treec4a3b1525d8a1184010778c8d2b6ddcb07d69834
parent3654de65058dffd3d5f6f5afb63dc1f5ec6a78fc
parentbd62eb5844a919363a289170d4065fd316224be3
Merge remote-tracking branch 'origin/fixes-kuadrosx' into fixes-patcito