Manuel Friedli 020fc96036 Merge branch 'develop' into feature/seconds ... Conflicts: .gitignore manifest.appcache showcase/index.html uhr.js		2014-08-11 23:04:28 +02:00
..
index.html	Merge branch 'develop' into feature/seconds	2014-08-11 23:04:28 +02:00