Merge branch 'master' of ghosthacking.net:genregenerator

Conflicts:
	genres.yaml
This commit is contained in:
Maximilian Gass 2011-06-04 23:05:48 +02:00
commit fd81edfaf9
1 changed files with 1 additions and 0 deletions

View File

@ -48,6 +48,7 @@ group:
- Trance
- Western
subgroup:
- 80s
- Acid
- Alternative
- Anatolian