Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
authorJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Fri, 21 Nov 2014 14:31:14 +0000 (15:31 +0100)
committerJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Fri, 21 Nov 2014 14:31:14 +0000 (15:31 +0100)
commitc63f7fbfafbc7cd1b984e73274f87671d719cab2
treeaa8ed54a2d9119bc1c12c5c40d638258104159e5
parent057cfc2e070a847e419e1905b8ee4582300bb3ed
parente901b609baa4dd5f681e2a5257c9e504997e3377
Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency