Merge branch 'master' of /home/lilydev/git/lily/

* 'master' of /home/lilydev/git/lily/:
  GDP NR 3.5 Typos
  First update from Joseph.
  Update from Kurt.
  Use string-port for graphviz test, redirecting output through
  Fix for smobs.hh
  Rerun convert-ly on translations.

Conflicts:

	Documentation/de/user/expressive.itely
	Documentation/es/user/expressive.itely
	Documentation/fr/user/expressive.itely

diff --cc Documentation/es/user/expressive.itely
index db2495787adb69e632f7e10a280f49279186307d,fdf3fa1979d05d3f8ba4f327d0a1a51cd8d82371..53e56f219ab006874422d4b3c3a830fecac4fa7c
--- 1/Documentation/es/user/expressive.itely
--- 2/Documentation/es/user/expressive.itely
+++ b/Documentation/es/user/expressive.itely
@@@ -241,10 -241,11 +241,10 @@@ c2 b4 a g1\espressiv
  Los @notation{Crescendi} y @notation{decrescendi} se pueden
  tipografiar como marcas textuales en lugar de reguladores.  Las
  instrucciones incorporadaas que activan estos modos de texto son
- @code{\crescTextCresc}, @code{\dimTextDecr}, @code{\dimTextDecresc} y
+ @code{\crescTextCresc}, @code{\dimTextDecresc}, @code{\dimTextDecr} y
  @code{\dimTextDim}.  Las instrucciones correspondientes
 -@code{\crescHairpin}, @code{\setHairpinDim} y
 -@code{\dimHairpin} hacen que vuelvan a aparecer los reguladores
 -de nuevo:
 +@code{\crescHairpin} y @code{\dimHairpin} hacen que vuelvan a aparecer
 +los reguladores de nuevo:
  
  @lilypond[verbatim,quote,relative=2]
  c\< d e f\!