[Dolibarr-git] [Dolibarr/dolibarr] dc5ad1: Fix: Total missing

[Laurent Destailleur]

  Branch: refs/heads/3.3_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: dc5ad1a0f3ce4d4acfcbe281e23c5ca188dfd480
      
https://github.com/Dolibarr/dolibarr/commit/dc5ad1a0f3ce4d4acfcbe281e23c5ca188dfd480
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M htdocs/compta/facture/impayees.php

  Log Message:
  -----------
  Fix: Total missing


  Commit: c24659b3a57979260c59eee0256ac0204096f521
      
https://github.com/Dolibarr/dolibarr/commit/c24659b3a57979260c59eee0256ac0204096f521
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M htdocs/admin/geoipmaxmind.php

  Log Message:
  -----------
  Merge branch '3.3' of address@hidden:Dolibarr/dolibarr.git into 3.3


  Commit: bff5de182ee97dcbb41baff772c6d2ae60640406
      
https://github.com/Dolibarr/dolibarr/commit/bff5de182ee97dcbb41baff772c6d2ae60640406
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M htdocs/compta/facture/impayees.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.3_backported

Conflicts:
        htdocs/compta/facture/impayees.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/06263007a0d0...bff5de182ee9