Commit Graph

2 Commits

Author SHA1 Message Date
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
2013-07-24 15:25:00 +02:00
eldy
5a0448e821 Trans: Update nl_NL language file 2011-10-10 02:42:44 +02:00