Merge changes from upstream & more

This commit is contained in:
ZonD Eighty 2013-01-10 22:14:34 +04:00
commit a2ac36b676
22 changed files with 5760 additions and 4261 deletions

File diff suppressed because it is too large Load diff