[zanata-commits] [zanata/zanata-python-client] aedc7b: Add the merge option for importing the translation...

[noreply at github.com]

Branch: refs/heads/devel
Home:   https://github.com/zanata/zanata-python-client

Commit: aedc7bd694af7fb3b7bcb2a6d0af0948e3ebe100
    https://github.com/zanata/zanata-python-client/commit/aedc7bd694af7fb3b7bcb2a6d0af0948e3ebe100
Author: James Ni <kent.neo at gmail.com>
Date:   2011-04-12 (Tue, 12 Apr 2011)

Changed paths:
  M zanataclient/zanata.py
  M zanataclient/zanatalib/docservice.py
  M zanataclient/zanatalib/rest/client.py

Log Message:
-----------
Add the merge option for importing the translation, issue28