Merge branch 'devel-2.5'
authorMichael Hanselmann <hansmi@google.com>
Thu, 24 Nov 2011 13:59:52 +0000 (14:59 +0100)
committerMichael Hanselmann <hansmi@google.com>
Thu, 24 Nov 2011 14:11:18 +0000 (15:11 +0100)
commitc1ef933ccc05a8a4fb981aaae40657eb11360e0f
treea4cb1ea88c36b3482e76a3a206892206e475e86d
parent75191077b11ab24e31e4b8e8d4504e0c6c12b8a4
parent53f75d02725124a4620b08d164033a7af5d7c5d1
Merge branch 'devel-2.5'

* devel-2.5:
  ConfigWriter: Fix epydoc error
  ConfigWriter: Fix epydoc error

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
lib/config.py