Merge branch 'develop-olympus' into develop

This commit is contained in:
Cesar G 2014-01-23 14:13:34 -08:00
commit 4c102322c1

View file

@ -23,10 +23,11 @@ involved in phpBB.
phpBB Lead Developer: naderman (Nils Adermann)
phpBB Developers: bantu (Andreas Fischer)
EXreaction (Nathan Guse)
dhruv.goel92 (Dhruv Goel)
EXreaction (Nathan Guse)
imkingdavid (David King)
nickvergessen (Joas Schilling)
prototech (Cesar Gallegos)
Contributions by: leviatan21 (Gabriel Vazquez)
Raimon (Raimon Meuldijk)