Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Wed, 16 Jul 2014 07:13:38 +0000 (09:13 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Wed, 16 Jul 2014 07:13:38 +0000 (09:13 +0200)
commitad5901f18852550fe4b9c1b87f19ce51ca11db5e
tree620a6ffbe1c3907a56af379881af7a2b0cf0cc59
parent52e6acf03bb80da6162b37bc0447ec695429780d
parentc363451f959c5daabc9a37bcbd42930cc851c2e1
Merge remote-tracking branch 'upstream/8.0' into 8.0