Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Mon, 11 Aug 2014 15:52:11 +0000 (17:52 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Mon, 11 Aug 2014 15:52:11 +0000 (17:52 +0200)
commit3d1a64130660f3df7b16235709e0a27363df55ab
tree676b7863a7815d27c1d2666008137bf99f40b9f1
parent95da70ba47bcbe5020c6f9ff55dd0f0e3f74bbe6
parentfda1e7d29031ecfeed2ca4bcb353fa123bfe0f06
Merge remote-tracking branch 'upstream/8.0' into 8.0