commit 415c73d27a49f0b215188f0562779be327f1fa8a
Merge: d59dd39 f4a1dff
Author: Klaus Aehlig <[email protected]>
Date: Tue Sep 23 11:26:28 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.11
Bump revision bump 2.11.6
Pepare NEWS entry for a 2.11 point release
* stable-2.12
Make watcher identify itself on disk verification
Suffix bump for 2.12.0~rc2
Prepare NEWS file for 2.12.0~rc1
Conflicts:
configure.ac: ignore suffix bump
Signed-off-by: Klaus Aehlig <[email protected]>
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
