commit be0a4b2629ce6127c2a81cc82e80f9f2268a8e4f
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-05-09

    Release version 3.1.1

 NEWS         |    3 +++
 configure.ac |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

commit f979ded30a7ad345b02678ee9257b45729c0bd09
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-04-25

    Rename configure.in to configure.ac

 autogen.sh   |    2 +-
 configure.ac |  242 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in |  243 ----------------------------------------------------------
 3 files changed, 243 insertions(+), 244 deletions(-)

commit ef9b74c34fa396eb6fbf963864e2e9444f67df48
Merge: 8d7c2ac bfbefcf
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-04-25

    Merge branch 'gnome-3-0'
    
    Conflicts:
    	configure.in
    	library/gkr-debug.c
    	library/gkr-operation.c
    	po/tr.po