Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Mon, 28 Jul 2014 11:47:29 +0000 (13:47 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Mon, 28 Jul 2014 11:47:29 +0000 (13:47 +0200)
commitb2c7f642fde5600db6eb4c7db50bf9dab82c6f7f
treed7338959900bf54f21025a7b69e8e36146475d36
parent1b6d122bb95f3648f5b7c1ca4ca90f20716c6425
parentf90b29b9382b8865a055f72432a85b2837642d7c
Merge remote-tracking branch 'upstream/8.0' into 8.0