Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Mon, 22 Sep 2014 11:59:33 +0000 (13:59 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Mon, 22 Sep 2014 11:59:33 +0000 (13:59 +0200)
commit815b01ea59f5e3e42e0d787cb36bf6cd3a868ad6
treee5534b192645f26f31622c0b36feec9912c2e46a
parentc522334501ebd272baef959a972893de740328ea
parent1d6c0b2148058d9284904efd1bad64f1c91a1fd1
Merge remote-tracking branch 'upstream/8.0' into 8.0