Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Wed, 30 Jul 2014 08:17:18 +0000 (10:17 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Wed, 30 Jul 2014 08:17:18 +0000 (10:17 +0200)
commit09c41eb2c6097a3ab25df6c9795b74f7bf3151ba
treef9533c0063a82c1d7bef6a15c0f36c94877d63b7
parent83dc0957cf1b418c75a6c4ddd95eab8fb762d941
parent64ed698a584e8c5242369e2e42b6f7d26e5c8694
Merge remote-tracking branch 'upstream/8.0' into 8.0