Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 12 Dec 2013 11:56:36 +0000 (12:56 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 12 Dec 2013 11:56:36 +0000 (12:56 +0100)
commitba8ee979d0bf5b821ab1241706cd1f15272dccd1
tree656e312b8ae7bd819614e0173f18cbe585809a9a
parentedfbd585bec1f9cd5a0b3aa0de49c5ae86b75791
parent5162203874e3687045c1d84efc79ae77f8ccc8a1
Merge branch 'master' into develop