Merge branch 'master' of ssh://git.code.sf.net/p/amos/code
Authored by: Michael Schatz 2015-01-21
Parents: [60d4e5][ad2386]