9 Commits

Include renames

Author	SHA1	Message	Date
rMalie	c17e7c236d	// MERGE with 1.4 r7770	2011-07-28 09:20:57 +00:00
rMalie	5f6f018885	// REVERT MERGE	2011-07-27 13:35:06 +00:00
rMalie	233c0076b7	// MERGE with trunk revision 7754	2011-07-27 12:48:42 +00:00
rMalie	8d3e36c904	// Fix strict standard on paymentModule + fix stats SQL bug	2011-07-22 09:49:29 +00:00
rMalie	73d6f4267b	// Context part 16 (shops)	2011-07-20 12:08:15 +00:00
rMalie	923269001b	// Fix shop association on new object + some strict standard for Franck	2011-07-11 13:18:17 +00:00
rGaillard	8fc7f11014		2011-07-06 10:54:11 +00:00
rGaillard	d1a13007b9		2011-07-06 10:10:43 +00:00
aFolletete	05a58f53e6	// 1.5 branche creation	2011-04-12 18:24:40 +00:00