Merge changes that existed in branch concerning slicefamily w/ trunk.
[nodemanager.git] / doc /
drwxr-xr-x   ..
-rwxr-xr-x 493 DocBookLocal.py
-rw-r--r-- 1739 Makefile
-rw-r--r-- 5706 NMAPI.xml.in
-rw-r--r-- 1917 upload.php