Merge branch 'stable-2.5' into devel-2.5
authorMichael Hanselmann <hansmi@google.com>
Thu, 19 Jan 2012 12:45:57 +0000 (13:45 +0100)
committerMichael Hanselmann <hansmi@google.com>
Thu, 19 Jan 2012 12:48:03 +0000 (13:48 +0100)
commit431f2a80e044b55218ea614475416916145ce3f7
treefd1d28db56235392055d8a36b3bb05d58d1ee686
parent58ea8d17b5b6deb4b93ce0f419c449c35a35a0d5
parent9f18e2ccb130682148a605bd9709d3df98d2d6c6
Merge branch 'stable-2.5' into devel-2.5

* stable-2.5:
  Bump version to 2.5.0~rc5, update NEWS
  Add UnescapeAndSplit unittest for multi-escapes
  Fix a bug in command line option parsing code

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