Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Wed, 6 Aug 2014 12:17:16 +0000 (14:17 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Wed, 6 Aug 2014 12:17:16 +0000 (14:17 +0200)
commitfe39110a77637a753bd962feb8c2f2e061bb5000
treeb44c314343b6deab914fbdf23554f6a4434aaffa
parent2e1e6ab86ec0e173e493dd5c87b5ae81a1cd80c0
parente106ef91efa40150c30022dff4b7cd43d06d24c9
Merge remote-tracking branch 'upstream/8.0' into 8.0