Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Wed, 16 Jul 2014 10:19:05 +0000 (12:19 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Wed, 16 Jul 2014 10:19:05 +0000 (12:19 +0200)
commitd12de2cf6ff4cdd0164063a670f76cecc6f89901
tree9280c4c5971a7b27396b414d15445a8a59a4e36f
parentad5901f18852550fe4b9c1b87f19ce51ca11db5e
parentec89c9ceadfef666dee018d1d5fbf882f4ca3e18
Merge remote-tracking branch 'upstream/8.0' into 8.0