Merge branch 'dev' into upmgr
commitea4463dc994f402d7ceafb4c1acb44542f64a0fc
authorTomáš Brada <tomasbrod@azet.sk>
Mon, 5 Oct 2015 09:19:14 +0000 (5 11:19 +0200)
committerTomáš Brada <tomasbrod@azet.sk>
Mon, 5 Oct 2015 09:19:14 +0000 (5 11:19 +0200)
tree363d2d321957beffadfff5876deabdcebad1985a
parent7997cba78a0199b345aa31565e5b40da99667d76
parentfccfbb7dde9be88b82fe2c167651224774cbfa7d
Merge branch 'dev' into upmgr