Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12120] Remove imkingdavid from active authors
This commit is contained in:
Andreas Fischer 2014-07-11 12:03:12 +02:00
commit 9cd327e127

View file

@ -25,7 +25,6 @@ phpBB Lead Developer: naderman (Nils Adermann)
phpBB Developers: bantu (Andreas Fischer) phpBB Developers: bantu (Andreas Fischer)
dhruv.goel92 (Dhruv Goel) dhruv.goel92 (Dhruv Goel)
EXreaction (Nathan Guse) EXreaction (Nathan Guse)
imkingdavid (David King)
marc1706 (Marc Alexander) marc1706 (Marc Alexander)
nickvergessen (Joas Schilling) nickvergessen (Joas Schilling)
nicofuma (Tristan Darricau) nicofuma (Tristan Darricau)
@ -56,6 +55,7 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
dhn (Dominik Dröscher) [05/2007 - 01/2011] dhn (Dominik Dröscher) [05/2007 - 01/2011]
GrahamJE (Graham Eames) [09/2005 - 11/2006] GrahamJE (Graham Eames) [09/2005 - 11/2006]
igorw (Igor Wiedler) [08/2010 - 02/2013] igorw (Igor Wiedler) [08/2010 - 02/2013]
imkingdavid (David King) [11/2012 - 06/2014]
kellanved (Henry Sudhof) [04/2007 - 03/2011] kellanved (Henry Sudhof) [04/2007 - 03/2011]
Oleg (Oleg Pudeyev) [01/2011 - 05/2013] Oleg (Oleg Pudeyev) [01/2011 - 05/2013]
rxu (Ruslan Uzdenov) [04/2010 - 12/2012] rxu (Ruslan Uzdenov) [04/2010 - 12/2012]