Merge branch 'genete_smart_link_master'
authorCarlos Lopez <genetita@gmail.com>
Fri, 17 Sep 2010 16:19:29 +0000 (18:19 +0200)
committerCarlos Lopez <genetita@gmail.com>
Fri, 17 Sep 2010 16:19:29 +0000 (18:19 +0200)
commit633fda4aace074fdc72bdf7a2eae46a1b721dda1
treef725c7d63e487447850764f07da64613d3293cb5
parentd1041a413264492a5bba12ebfa7d0cbd67ce1cff
parent7f6cef11226c48906a883b5f411d33546d8c7c1c
Merge branch 'genete_smart_link_master'