Merge branch 'genete_master'
authorCarlos Lopez <genetita@gmail.com>
Sat, 23 Jan 2010 09:48:12 +0000 (10:48 +0100)
committerCarlos Lopez <genetita@gmail.com>
Sat, 23 Jan 2010 09:48:12 +0000 (10:48 +0100)
commit7de31de4c80f592759d43e5873697d7ba22b9755
tree3e0d9492d5fd9e29fa244cb9ad66df288e12d5dc
parentd615bff31f340357ef81ba7cf9855df6716e4284
parent40cf4ac76bfd001c48f7f5ca4d97c11f7a9f7d91
Merge branch 'genete_master'