Merge commit 'cbb35cca'
[projects/chimara/chimara.git] / AUTHORS
1 Philip Chimento
2 Marijn van Vliet