[Dolibarr-git] [Dolibarr/dolibarr] 9bc0f5: Fix: set of country

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9bc0f54ae82d37777ee48f15c4562e314572ddcb
      
https://github.com/Dolibarr/dolibarr/commit/9bc0f54ae82d37777ee48f15c4562e314572ddcb
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Fix: set of country


  Commit: d9106b6e850446e706050510fd8e442184d4e273
      
https://github.com/Dolibarr/dolibarr/commit/d9106b6e850446e706050510fd8e442184d4e273
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Add debug info to find a bug


  Commit: 5e357316938e21441c1cdb9a062036fa1f63435f
      
https://github.com/Dolibarr/dolibarr/commit/5e357316938e21441c1cdb9a062036fa1f63435f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Add debug info to find a bug


  Commit: 2f1340a6c6b6a3a78f1adfd3b4276563eeacd4ec
      
https://github.com/Dolibarr/dolibarr/commit/2f1340a6c6b6a3a78f1adfd3b4276563eeacd4ec
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M htdocs/main.inc.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into develop

Conflicts:
        htdocs/societe/class/societe.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/33b4c9fad727...2f1340a6c6b6