Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Mon, 21 Jul 2014 07:51:35 +0000 (09:51 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Mon, 21 Jul 2014 07:51:35 +0000 (09:51 +0200)
commitb16fdbf0744139cc1c60d128496b2a5edd5ca87b
tree54baf85d0fb9ddd7eb5a971bfd5d4ac4cb15409c
parent2e40d355e0f63b086cf1807ca0a0fc2b15dacd93
parent869b647c0223fd9abcac6f44b0c8b5d45a80cdf6
Merge remote-tracking branch 'upstream/8.0' into 8.0