Wääh
Merge branch 'devel' of https://github.com/ohtu2014-halme/ilmoprojekti into devel
Merge pull request #113 from nsikkila/master

daf
Merge remote-tracking branch 'upstream/devel'