Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 2 Jun 2014 13:13:09 +0000 (15:13 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 2 Jun 2014 13:13:09 +0000 (15:13 +0200)
commit0a1447e866377773af2661ffdd0affb73e71547e
treeb00c0d42374e8818942fef8f3ca6e148d73bf24d
parent445c3dc9ac925588cb1ea08ee913e0d0638ffa37
parentf8f3bc9e76c5e86941feeb9518ca2edee618cad5
Merge branch 'master' into develop