Merge branch 'master' of git://valera-ext.nynaeve.net/silc into silc.1.1.branch