commit aec6c6333d87daa9ff7ec80d50427982295af384
Author: Rui Matos <tiagomatos@gmail.com>
Date:   Tue May 13 17:56:05 2014 +0200

    3.12.2

M	NEWS
M	configure.ac

commit 41afb698d1477060202f55c1e4731005dffa14e4
Author: Bastien Nocera <hadess@hadess.net>
Date:   Fri Apr 25 18:22:04 2014 +0200

    gnome-rr: Better debug application
    
    This change will make the debug application listen for changes and print
    them as they occur.
    
    Conflicts:
    	libgnome-desktop/gnome-rr-debug.c

M	libgnome-desktop/gnome-rr-debug.c