Merge branch 'master' into friendlist
[situare] / release /
2010-03-26 Pekka NissinenInitial version