Merge branch 'master' into genete_core_review
authorCarlos Lopez <genetita@gmail.com>
Sun, 13 Jun 2010 19:34:23 +0000 (21:34 +0200)
committerCarlos Lopez <genetita@gmail.com>
Sun, 13 Jun 2010 19:34:23 +0000 (21:34 +0200)
commit4d106ef7cccca26ba8a588a3ae9f722e8ca70df6
tree2c5f91d44464a1ce018b537e665d8dfb39db5f17
parent523025750a0bd790400ac69f74e8280a5751bd0a
parent93fd70f57db7f3277d3a02f79ba6335173706294
Merge branch 'master' into genete_core_review