Merge branch 'develop' into release-1.5.3
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 22 Jan 2014 09:26:19 +0000 (10:26 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 22 Jan 2014 09:26:19 +0000 (10:26 +0100)
commit8592c315eb727efccacb5ded5f7a109cfb415d5f
tree84f4b5d1605ef5cfe93434fe6d5840b0637da4c1
parent8e2c944e4d9a8c881184bec9d60e458fb5c20216
parent4f84c74d1f9030642de0bd71d6d2d0ed08400c9c
Merge branch 'develop' into release-1.5.3