Merge branch 'develop' into release-1.4.6
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 8 Oct 2013 09:28:57 +0000 (11:28 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 8 Oct 2013 09:28:57 +0000 (11:28 +0200)
commit7d512002911ff7ed915995bf58b12e69783438bd
tree98efd4456ba0e4401eaa1143740c746ca6e69b1c
parent86f7f0cc3c316fc9f1caeedc5ba63ccfb7a0ffd7
parenta67a6766a6ca69bb97d2fdc87256ec9f0fa5122d
Merge branch 'develop' into release-1.4.6