Merge branch 'master' of github.com:claudehohl/Stikked

This commit is contained in:
Claude 2012-04-14 15:36:32 +02:00
commit 736f039423