[FIX] the vcs-extend-develop line to use for openerp_command in the documentation
launchpad #1249566: [bzr] no lp: resolution in offline mode
[IMP] git: implement merges and vcs-revert

Attempt to simplify the code a bit
[IMP] improve revert and tracing

TODO: unit tests and using logger instead of print
[IMP] git merge: use --no-edit to accept default mechanical merge messages
[IMP] looks like archive should be part of the vcs interface
[IMP] slight refactoring of git interface
[IMP] basic test for git merge and revert
[IMP] comments and logging
[MRG] A. Fayolle's fix of openerp-command address
[MRG][doc] cherry pick openerp-command bzr location
1.8.4 release
New dev cycle
Bumped version in doc, and setup less confusing doc upload path
[MRG] merged fix for #1249566
[MRG] Merged stable 1.8 branch in trunk
[MRG] Refactor of Git subsystem, with merge and revert support
Minor pep8 errors in test_git.py
Moved again the a.r.openerp-1.9 after bzr import

Merge remote-tracking branch 'origin/a.r.openerp-1.9' into a.r.openerp-1.9