Merge branch 'stable-2.8' into stable-2.9
authorKlaus Aehlig <aehlig@google.com>
Mon, 7 Oct 2013 15:10:42 +0000 (17:10 +0200)
committerKlaus Aehlig <aehlig@google.com>
Mon, 7 Oct 2013 15:26:25 +0000 (17:26 +0200)
* stable-2.8
  Fix outdated documentation for users-setup

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>


Trivial merge