[Fusioninventory-commit] [fusinv/fusioninventory-agent] 74d21e: Merge branches '2.2.x+collect' and '2.2.x+license'...

[Gonéri Le Bouder]

  Branch: refs/heads/2.2.x+extra
  Home:   https://github.com/fusinv/fusioninventory-agent
  Commit: 74d21e5c2fc1007081f1a2a841b21ec0c57f5c11
      https://github.com/fusinv/fusioninventory-agent/commit/74d21e5c2fc1007081f1a2a841b21ec0c57f5c11
  Author: Gonéri Le Bouder <goneri at rulezlan.org>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

  Changed paths:
    A lib/FusionInventory/Agent/Task/Inventory/Input/MacOS/License.pm
    A lib/FusionInventory/Agent/Task/Inventory/Input/Win32/License.pm
    M lib/FusionInventory/Agent/Task/Inventory/Input/Win32/OS.pm
    M lib/FusionInventory/Agent/Task/Inventory/Inventory.pm
    A lib/FusionInventory/Agent/Tools/Generic/License.pm
    M lib/FusionInventory/Agent/Tools/Win32.pm
    A resources/generic/license/adobe/README
    A resources/generic/license/adobe/cache.db-sample1
    A t/inventory/generic/license.t

  Log Message:
  -----------
  Merge branches '2.2.x+collect' and '2.2.x+license' into 2.2.x+extra