Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Tue, 23 Sep 2014 08:04:16 +0000 (10:04 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Tue, 23 Sep 2014 08:04:16 +0000 (10:04 +0200)
commitb1460731a1425f4013eff3989c47c9ecdb239638
treed263c9d6b51546739d4bc8a6212a682ed170ec23
parent815b01ea59f5e3e42e0d787cb36bf6cd3a868ad6
parent4614fdf75505c77f821599d3e4308e9b10d212e2
Merge remote-tracking branch 'upstream/8.0' into 8.0