Merge branch 'stable-2.3' into devel-2.3
authorMichael Hanselmann <hansmi@google.com>
Wed, 1 Dec 2010 15:55:47 +0000 (16:55 +0100)
committerMichael Hanselmann <hansmi@google.com>
Wed, 1 Dec 2010 15:58:31 +0000 (16:58 +0100)
commitcd22574bee62fb3947e4f6375aecf6fb6c9084a2
tree749c921e697050b88dcccbd0daf6f2c46dc713ce
parent5d9f9cbadc397b9c908275e199d1d448f1eb11b6
parent7c324b88ac28a3c081ffac529fa820ffcc78d40b
Merge branch 'stable-2.3' into devel-2.3

* stable-2.3:
  Bump version for 2.3.0

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