From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 24 Nov 2011 12:15:46 +0000 (+0100)
Subject: Merge branch 'stable-2.5' into devel-2.5
X-Git-Tag: v2.6.0beta1~34^2~41
X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/1df43aa3fa6865c9336ad1379e21e54b8ce6d548

Merge branch 'stable-2.5' into devel-2.5

* stable-2.5:
  ConfigWriter: Fix epydoc error

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Andrea Spadaccini <spadaccio@google.com>
---

1df43aa3fa6865c9336ad1379e21e54b8ce6d548