Merge branch 'stable-2.2' into devel-2.2
authorMichael Hanselmann <hansmi@google.com>
Mon, 4 Oct 2010 16:41:52 +0000 (18:41 +0200)
committerMichael Hanselmann <hansmi@google.com>
Mon, 4 Oct 2010 16:48:45 +0000 (18:48 +0200)
* stable-2.2:
  Bump version to 2.2.0, update NEWS
  Fix instance rename regression from 3fe11ba3

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

1  2 
NEWS

diff --cc NEWS
Simple merge