Merge branch 'genete_master'
authorCarlos Lopez <genetita@gmail.com>
Sun, 24 Jan 2010 11:03:59 +0000 (12:03 +0100)
committerCarlos Lopez <genetita@gmail.com>
Sun, 24 Jan 2010 11:03:59 +0000 (12:03 +0100)
commit91defb05c4f94290665a867c6447c47f4339d013
tree47ee9ce0ade535c2f69d29f9c7cfca42434e64ea
parente293ff00bc3304a09b1a5b17852c7f1a93a34f12
parent058344eda02f91703c0bc4ad7734714a53032b68
Merge branch 'genete_master'