Merge branch 'master' of ssh://git.onelab.eu/git/nodeconfig
-rw-r--r-- 9 .gitignore
-rw-r--r-- 1420 Makefile
drwxr-xr-x - PLCAPI
drwxr-xr-x - PlanetLabConf
drwxr-xr-x - db-config.d
-rw-r--r-- 5180 nodeconfig.spec