Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/11613] Allow cookies to work on netbios domains
This commit is contained in:
Tristan Darricau 2014-11-27 10:39:38 +01:00
commit c7116f1a54

Diff content is not available