degasus d60cc373d1 Revert "Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae"
This reverts commit d0301ca89d318d8d6e3e7fde9c4b60e470e184e4.

Conflicts:
	.gitignore
2013-01-24 16:11:07 +01:00
..