Merge branch 'master' into browser
[projects/chimara/chimara.git] / AUTHORS
1 Philip Chimento
2 Marijn van Vliet