Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Mon, 11 Aug 2014 13:14:08 +0000 (15:14 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Mon, 11 Aug 2014 13:14:08 +0000 (15:14 +0200)
commit21a1b46aad29fc3137b02b54d75eec55c95bb168
tree3f42af3822778adf077f7eaea5f0df46c88a1812
parentf46ecc73a4ec039d2d72688611520000bb9cc494
parent8dc8302dadfbc16592d18669c0b99edcbb123f86
Merge remote-tracking branch 'upstream/8.0' into 8.0