Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Fri, 8 Aug 2014 07:27:21 +0000 (09:27 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Fri, 8 Aug 2014 07:27:21 +0000 (09:27 +0200)
commit33e612e7502a3a859f6c751174a54dc6c61c0763
treea6d235c2bd0964c69465f1dd9eaa42edd22db160
parent669adf9cf510901ee0de1afb8b727cd75b787f4e
parent4c8c7224014a1997c9896180922a6ef9f2eeca01
Merge remote-tracking branch 'upstream/8.0' into 8.0