Merge branch 'stable-2.12' into stable-2.13
authorHrvoje Ribicic <riba@google.com>
Wed, 25 Mar 2015 14:54:07 +0000 (14:54 +0000)
committerHrvoje Ribicic <riba@google.com>
Wed, 25 Mar 2015 15:08:33 +0000 (16:08 +0100)
commitf6f16c1f5f7bb45616650138242db40071580cd0
treeaa8848088d6dfe6c5e131fcfef11c57cc453e72c
parentcdb253bdc2228e2e1a88eb9c9e1452f2349b6782
parent8512e317abf1e79eb4ddea3ce775989426c66810
Merge branch 'stable-2.12' into stable-2.13

* stable-2.12
  Revision bump to 2.12.2
  Update NEWS for 2.12.2

Conflicts:
NEWS
configure.ac
Resolution:
Use 2.13 version suffix, merge NEWS.

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>
NEWS