Merge branch 'master' into daniele
tree53e0113be7babf8d7ee264d68e6b0e97b51425c5
-rw-r--r-- 17 .gitignore
-rw-r--r-- 15122 COPYING
-rw-r--r-- 669 newfile.skel
drwxr-xr-x - tmp