Merge remote-tracking branch 'origin/gsoc2012-interactions' 65/12665/2
-rw-r--r-- .gitignore
drwxr-xr-x SEP
drwxr-xr-x git_hooks
drwxr-xr-x scilab