Merge branch 'master' of linz:/srv/git/mandelbrot
-rwxr-xr-x 2556 mandelbrot
drwxr-xr-x - xulapp