Merge branch 'develop' into release-1.6.2
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 21 Nov 2014 11:40:05 +0000 (12:40 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 21 Nov 2014 11:40:05 +0000 (12:40 +0100)
commitca1c8b1f5e5a7862a68273450abf652790214785
treea4a912e2180d7e20cc530702b3e8c93b43c7328b
parent803ed3487449d4b07ab8e38dc15e76ea96446c3e
parente901b609baa4dd5f681e2a5257c9e504997e3377
Merge branch 'develop' into release-1.6.2