#3 fix

Merged
dct merged 2 commits from HHPW/branch-swl into HHPW/master 2 veckor sedan

2 Incheckningar

Upphovsman SHA1 Meddelande Datum
  LaveyD 63401f1270 Merge branch 'master' of http://git.whgxhx.com:53000/HHPW/client-mazu into branch-swl 2 veckor sedan
  nirvana e423c538d2 修改swl 2 veckor sedan