git.inspyration.org Git - odoo/odoo.git/commit

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 34aa521 a86a895)

author	P. Christeas <p_christ@hol.gr>
	Fri, 13 Feb 2009 18:23:59 +0000 (20:23 +0200)
committer	P. Christeas <p_christ@hol.gr>
	Fri, 13 Feb 2009 18:23:59 +0000 (20:23 +0200)
commit	086e4a29c6fcb65e870efb3656c417c0f9953e24
tree	237ddadb0bc1ea88dd0459402d9c812e729fc642	tree \| snapshot
parent	34aa521076ab76d77fbb8e6f5f0be36cc8be6b8f	commit \| diff
parent	a86a89517eafd8fbc688e6eb213a890e18406c16	commit \| diff

Merge commit 'origin/master' into mdv-gpl3-py26

Conflicts:
bin/tools/translate.py
setup.py

bzr revid: p_christ@hol.gr-20090213182359-arcslht0h9ix34qr

bin/addons/__init__.py	diff1 \|	diff2 \|	blob \| history
bin/osv/orm.py	diff1 \|	diff2 \|	blob \| history
bin/tools/misc.py	diff1 \|	diff2 \|	blob \| history
bin/tools/translate.py	diff1 \|	diff2 \|	blob \| history
setup.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.