Merge branch 'master' into genete_master
authorCarlos Lopez <genetita@gmail.com>
Sun, 9 May 2010 19:06:27 +0000 (21:06 +0200)
committerCarlos Lopez <genetita@gmail.com>
Sun, 9 May 2010 19:06:27 +0000 (21:06 +0200)
commit48fc029e00f4798ce16804d3eaddaa326461279d
tree89a4e7b424bf6edb48306e05338bba5e6c020394
parent0dca8fcc062e3cdafb5124b86d47a16da5f1980f
parentda1bd2a89e645cd52c373b82dc49ce1b92a2b721
Merge branch 'master' into genete_master