mergee
Merge remote-tracking branch 'origin/devel' into devel
timezone
Merge pull request #121 from nsikkila/master

siivoilua, pakotettu prio 10
Merge branch 'devel' of github.com:ohtu2014-halme/ilmoprojekti into devel
Kirjautumisnäkymä tasaiseksi
navipalkin leveys
Merge remote-tracking branch 'upstream/devel'