Merge branch 'develop' into fixing_travis
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 8 Apr 2014 10:31:44 +0000 (12:31 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 8 Apr 2014 10:31:44 +0000 (12:31 +0200)
commit14f359da5f642fde67b673c1b834b1ef026a44f7
treeb682d24b5a7b89ce1cfc80b446673035381191fd
parent44b61b3fe785bfbd00f0264cd57bedad19acdcea
parent69d40e505ef57770bddbb24ddc4156e0474993fc
Merge branch 'develop' into fixing_travis