Merge branch 'master-experimental'
authorDidier Raboud <odyx@debian.org>
Tue, 17 Apr 2012 09:57:26 +0000 (11:57 +0200)
committerDidier Raboud <odyx@debian.org>
Tue, 17 Apr 2012 09:57:26 +0000 (11:57 +0200)
1  2 
init-functions

diff --cc init-functions
Simple merge