Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Wed, 15 Oct 2014 07:36:30 +0000 (09:36 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Wed, 15 Oct 2014 07:36:30 +0000 (09:36 +0200)
commit11281db78d26ddb9ab053e685f5866c37c5cfc7e
treec3f0f3d15c5488122a4b51161ee3e414a1de9051
parentfa441ea9b9fec400dd56d08945b3345b48d3a8c3
parent1da0a0b3a58a7bc22b580427285462fc8e8e9bef
Merge remote-tracking branch 'upstream/8.0' into 8.0