Merge remote-tracking branch 'origin/master' into translation

author David Kastrup <dak@gnu.org>

Wed, 30 Jul 2014 15:37:14 +0000 (17:37 +0200)

committer David Kastrup <dak@gnu.org>

Wed, 30 Jul 2014 15:37:14 +0000 (17:37 +0200)
author David Kastrup <dak@gnu.org>
Wed, 30 Jul 2014 15:37:14 +0000 (17:37 +0200)
committer David Kastrup <dak@gnu.org>
Wed, 30 Jul 2014 15:37:14 +0000 (17:37 +0200)
diff --cc Documentation/fr/notation/expressive.itely
Simple merge
author	David Kastrup <dak@gnu.org>
	Wed, 30 Jul 2014 15:37:14 +0000 (17:37 +0200)
committer	David Kastrup <dak@gnu.org>
	Wed, 30 Jul 2014 15:37:14 +0000 (17:37 +0200)