Merge branch 'stable-2.13' into master

['Niklas Hambuechen' via ganeti-devel]

commit 39632eea7617f971cc3c8f8ae0a9020f63fe11e0
Merge: 6de3bd1 72b933c
Author: Niklas Hambuechen <nikl...@google.com>
Date:   Wed Nov 19 13:12:54 2014 +0100

    Merge branch 'stable-2.13' into master

    * stable-2.13
      Also mention --yes-do-it in gnt-job cancel help string
      Fix hlint warnings found by hlint 1.9.11