Conflicts:
	CONTRIBUTORS.md
This commit is contained in:
Luke Pulverenti 2013-08-23 23:49:38 -04:00
commit def2b00c98

View File

@ -27,4 +27,5 @@
- [brainfryd] (https://github.com/brainfryd) - [brainfryd] (https://github.com/brainfryd)
- [DGMayor] (http://github.com/DGMayor) - [DGMayor] (http://github.com/DGMayor)
- [Jon-theHTPC] (https://github.com/Jon-theHTPC) - [Jon-theHTPC] (https://github.com/Jon-theHTPC)
- [aspdend] (https://github.com/aspdend) - [aspdend] (https://github.com/aspdend)
- [RedshirtMB](https://github.com/RedshirtMB)