Merge branch 'stable' of atrey:/akce/MaM/MaMweb/mamweb into stable

* 'stable' of atrey:/akce/MaM/MaMweb/mamweb:
This commit is contained in:
Tomas Gavenciak 2015-10-07 21:11:19 +02:00
commit a235ed469f

Diff content is not available