commit 4e05c8d89c382a02992de4fad24c034d333bec2c Merge: d0b5bbc e1b218e Author: Roberto E. Vargas Caballero <[email protected]> AuthorDate: Fri Jul 17 19:36:19 2015 +0200 Commit: Roberto E. Vargas Caballero <[email protected]> CommitDate: Fri Jul 17 19:36:19 2015 +0200
Merge remote-tracking branch 'kcc/master'
