added possibility to merge volumes
treeed0115f1a289c7f7e45d976c04abe427638e97ae
-rw-r--r-- 92 .cvsignore
-rw-r--r-- 799 .gitignore
-rw-r--r-- 385 .hgignore
drwxr-xr-x - manual
drwxr-xr-x - src