Merge branch 'stable-2.6' into devel-2.6
authorMichael Hanselmann <hansmi@google.com>
Mon, 15 Oct 2012 13:52:45 +0000 (15:52 +0200)
committerMichael Hanselmann <hansmi@google.com>
Mon, 15 Oct 2012 14:03:37 +0000 (16:03 +0200)
* stable-2.6:
  Update NEWS and bump version to 2.6.1

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Bernardo Dal Seno <bdalseno@google.com>


Trivial merge