Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 24 Oct 2014 13:24:50 +0000 (15:24 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 24 Oct 2014 13:24:50 +0000 (15:24 +0200)
commit8d3a956c974661aa1a58f9083ae0af7c3e1a0ca3
treeb9a3a189d25c9bb904fe79fddfa221d609f1615a
parent01f1f62d2c8230fc7172fa68c46f4fdbab4d004a
parent552a84c1c70186f8eda84a5d84a4ed68483056fc
Merge branch 'master' into develop