Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Fri, 17 Oct 2014 09:45:05 +0000 (11:45 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Fri, 17 Oct 2014 09:45:05 +0000 (11:45 +0200)
commita3f9f403470ac136fe371c08a3f35d7e2ebb97b5
treee82a519f41b00f0d05746a3ee171b2496377c969
parent11281db78d26ddb9ab053e685f5866c37c5cfc7e
parentdafa7958c6f3712fa3a5fc6b38405751882d4b96
Merge remote-tracking branch 'upstream/8.0' into 8.0