Merge remote branch 'plouj/master' into devel
commitc8851156a8f174019a396d5a33772be5b049a973
authorChristian Thaeter <ct@pipapo.org>
Wed, 6 Jan 2010 15:52:13 +0000 (6 16:52 +0100)
committerChristian Thaeter <ct@pipapo.org>
Wed, 6 Jan 2010 15:52:13 +0000 (6 16:52 +0100)
treec0ca8eded3b6dadd5d483214965bd86f5d946aeb
parent64f387e21ef05ba33ad00ab3f4324610e2e05571
parent25dfd2601780c096320674dae4ce9b5e2f2b7bce
Merge remote branch 'plouj/master' into devel

* plouj/master:
  better grammar and sentences
  stop ECHO from logging to syslog