Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Tue, 5 Aug 2014 14:06:51 +0000 (16:06 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Tue, 5 Aug 2014 14:06:51 +0000 (16:06 +0200)
commitb992223b6a4227c6dfcaa310ec54605178725e88
treedbb529c84203bb6beafb8658ccee95e6db58c0c2
parent4c1ea5ee1d6dc67f06f5156d5d362afe6a2677b9
parent54b901effdd2ebbf5fbde33cf0b23e52c135821b
Merge remote-tracking branch 'upstream/8.0' into 8.0