Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Tue, 7 Oct 2014 09:22:50 +0000 (11:22 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Tue, 7 Oct 2014 09:22:50 +0000 (11:22 +0200)
commitfa441ea9b9fec400dd56d08945b3345b48d3a8c3
tree57b0b14995932cb721ea57501efddf55017b9a77
parente78e2a9139ecdc598afbd730cbbb22fa55f7aff1
parent7c8c6a77c70ddadbcad9b6aa48e57c2c13b243a3
Merge remote-tracking branch 'upstream/8.0' into 8.0