Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Thu, 7 Aug 2014 07:32:05 +0000 (09:32 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Thu, 7 Aug 2014 07:32:05 +0000 (09:32 +0200)
commit669adf9cf510901ee0de1afb8b727cd75b787f4e
treef1ef14158b2089cebd185e6e027b5094124f18f6
parent86e09cb0b9a8787992c6d295f1e9569aa9e6c331
parentf062eec6398e59f8636b00ef922be48a0f69c772
Merge remote-tracking branch 'upstream/8.0' into 8.0