[Dolibarr-git] [Dolibarr/dolibarr] fd03f5: Fix SQL syntax

[Juanjo Menent]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: fd03f582c97c728ee5cc1d5e382fe0214be22535
      
https://github.com/Dolibarr/dolibarr/commit/fd03f582c97c728ee5cc1d5e382fe0214be22535
  Author: Florian HENRY <address@hidden>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Changed paths:
    M htdocs/admin/limits.php

  Log Message:
  -----------
  Fix SQL syntax


  Commit: 0473bc5138e31459279fb478e8f56c524bf26c58
      
https://github.com/Dolibarr/dolibarr/commit/0473bc5138e31459279fb478e8f56c524bf26c58
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/fiche.php

  Log Message:
  -----------
  Fix missing $user into create call categorie


  Commit: db1c97bdad116c5d9c393d9918949826a76605fa
      
https://github.com/Dolibarr/dolibarr/commit/db1c97bdad116c5d9c393d9918949826a76605fa
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  changelog


  Commit: e2fac5dd9187478f91eeeb330ccc6950fbe86025
      
https://github.com/Dolibarr/dolibarr/commit/e2fac5dd9187478f91eeeb330ccc6950fbe86025
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/public/emailing/mailing-unsubscribe.php

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

Conflicts:
        ChangeLog


  Commit: 2d0f353529bc575173e551b6993fbd37b5acb0c8
      
https://github.com/Dolibarr/dolibarr/commit/2d0f353529bc575173e551b6993fbd37b5acb0c8
  Author: Juanjo Menent <address@hidden>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/limits.php
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Merge pull request #1859 from FHenry/3.6

Fix SQL syntax


Compare: 
https://github.com/Dolibarr/dolibarr/compare/772acd6bf91a...2d0f353529bc