Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Thu, 31 Jul 2014 07:33:23 +0000 (09:33 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Thu, 31 Jul 2014 07:33:23 +0000 (09:33 +0200)
commit7e423e3610b837f100d178e22d3b3f2591ba4751
treec2c29a830e5f1ecd3ffae67384b1c8976b735ea9
parent09c41eb2c6097a3ab25df6c9795b74f7bf3151ba
parentfd4fd35e3239c771ab9d692f47f61770ae882965
Merge remote-tracking branch 'upstream/8.0' into 8.0