Merge branch 'stable-2.10' into stable-2.11
Conflicts: NEWS configure.ac Resolutions: NEWS: add NEWS entry for 2.10.7 configure.ac: keep 2.11.4 as version number Signed-off-by:Helga Velroyen <helgav@google.com> Reviewed-by:
Guido Trotter <ultrotter@google.com>
Showing
Please register or sign in to comment