Merge remote-tracking branch 'origin/fixing_travis' into fixing_travis
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 8 Apr 2014 07:23:29 +0000 (09:23 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 8 Apr 2014 07:23:29 +0000 (09:23 +0200)
commit44b61b3fe785bfbd00f0264cd57bedad19acdcea
tree12254e9846b4673e80b99e1370dc585f260055a9
parent8e96e3cc3d2019b7e48dc4de6b61c8d890d97994
parentcf3adf2598e27b40c196e6439a3737184f2aa607
Merge remote-tracking branch 'origin/fixing_travis' into fixing_travis