Merge branch 'master' into genete_master
authorCarlos Lopez <genetita@gmail.com>
Tue, 20 Oct 2009 20:21:49 +0000 (22:21 +0200)
committerCarlos Lopez <genetita@gmail.com>
Tue, 20 Oct 2009 20:21:49 +0000 (22:21 +0200)
commit088fde89ce190900cbc9e35bace4cceb5af1737a
treecf94921c1f475e7abc8efa800534d46bc2615587
parent1631b0b7c026a3339fd5e20f5592e13c7e74fd0a
parentb451e1071d4238e269d5b1e666b52f9654987e6e
Merge branch 'master' into genete_master