Merge branch 'master' into genete_smart_link
authorCarlos Lopez <genetita@gmail.com>
Sat, 11 Sep 2010 12:42:03 +0000 (14:42 +0200)
committerCarlos Lopez <genetita@gmail.com>
Sat, 11 Sep 2010 12:42:03 +0000 (14:42 +0200)
commit1626f32ac1120649865bbdfcf8cc5462e11ca5f1
tree2b38de7cca00745f16bbc5386755b71e3f004b68
parent48688e1d9ee346c3fe9f2b636afb9abca9358275
parentfb79c2ed5d6bc0c8c2cdb11018a02d61aca1fdb7
Merge branch 'master' into genete_smart_link