shada: Add support for merging everything like described in the doc

This commit is contained in:
ZyX
2015-07-19 21:23:15 +03:00
parent 4bc053facd
commit 43fe98c9fb
7 changed files with 896 additions and 463 deletions

File diff suppressed because it is too large Load Diff