[Dolibarr-git] [Dolibarr/dolibarr] 0c0129: Fix travis

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0c012950164beb3ed3ba39564aaee1286db4ca16
      
https://github.com/Dolibarr/dolibarr/commit/0c012950164beb3ed3ba39564aaee1286db4ca16
  Author: aspangaro <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  Fix travis


  Commit: 01fbee0e068f6ca5896bad1080a699e18fb449be
      
https://github.com/Dolibarr/dolibarr/commit/01fbee0e068f6ca5896bad1080a699e18fb449be
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  Merge branch 'develop-patch34' of https://github.com/aspangaro/dolibarr
into aspangaro-develop-patch34

Conflicts:
        htdocs/comm/action/class/actioncomm.class.php


  Commit: ad395ef176d63511204115c58999c41530a0e0ad
      
https://github.com/Dolibarr/dolibarr/commit/ad395ef176d63511204115c58999c41530a0e0ad
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  Merge branch 'aspangaro-develop-patch34' into develop


  Commit: 5376c771d7cc910783eede6ef9115402ea8c051d
      
https://github.com/Dolibarr/dolibarr/commit/5376c771d7cc910783eede6ef9115402ea8c051d
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/product/composition/card.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/eac822d821a1...5376c771d7cc