Merge branch 'master' of git+ssh://git.freedesktop.org/git/xkeyboard-config
authorSergey V. Udaltsov <svu@gnome.org>
Mon, 26 Dec 2011 12:30:23 +0000 (12:30 +0000)
committerSergey V. Udaltsov <svu@gnome.org>
Mon, 26 Dec 2011 12:30:23 +0000 (12:30 +0000)
commit86f2a0226feac7bd8297a164746a24d8165faf4d
treee49d7cd9832d06d5a56ab8de2462f0885207ebcd
parentde45ece5ab09ab218998d35db3a9d0cb4686b546
parent3e3bae15e3268b963ee9f81cea716ea7732be4dd
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xkeyboard-config