Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Wed, 6 Aug 2014 15:57:27 +0000 (17:57 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Wed, 6 Aug 2014 15:57:27 +0000 (17:57 +0200)
commit86e09cb0b9a8787992c6d295f1e9569aa9e6c331
treebf6508e10fdaa3388cc551b48ebed169adeb54dc
parentfe39110a77637a753bd962feb8c2f2e061bb5000
parent135962184d68e278ee564502d079cb3235035015
Merge remote-tracking branch 'upstream/8.0' into 8.0