Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Thu, 24 Jul 2014 07:50:08 +0000 (09:50 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Thu, 24 Jul 2014 07:50:08 +0000 (09:50 +0200)
commit98e6de361c4216002a9607aff4b0e911b560d325
treec20e390fe8c37c26a970cc65fa6b0f88d4d94134
parent38df44bea95906d2f94d2e949f4741e3bcfcbedb
parentd0f259ee02ad51f95921388b4e9f20d659dbfc9e
Merge remote-tracking branch 'upstream/8.0' into 8.0