// blockcmsinfo: clearer wording.
Merge pull request #3 from xBorderie/patch-1

// blockcmsinfo: clearer wording.
// blockcmsinfo: shortened titles.
Merge pull request #4 from xBorderie/patch-2

// blockcmsinfo: shortened titles.
// norms
// norms
// new module version
[-] MO : blockcmsinfos - Fix multishop issue #PNM-2409

Conflicts:

	blockcmsinfo.php
Merge branch 'dev'

Conflicts:
	blockcmsinfo.php
	config.xml
// Added Readme.md
Merge branch 'master' into dev