Merge with master
authorGiuseppe Penone <giuspen@gmail.com>
Sun, 15 Sep 2013 11:05:25 +0000 (13:05 +0200)
committerGiuseppe Penone <giuspen@gmail.com>
Sun, 15 Sep 2013 11:05:25 +0000 (13:05 +0200)
1  2 
src/plugin.h
src/plugins/xkb/xkb-plugin.c

diff --cc src/plugin.h
Simple merge
Simple merge