[qet] [GIT] qet/documentation.git branch, master, updated. ccaf7d8e7122349eecb39a9dc1b55eb19899ec7e

[git@xxxxxxxxxxxxx]

This is an automated email from git. It was enerated because a ref
change was pushed to the repository "qet/documentation.git".

The branch, master has been updated
       via  ccaf7d8e7122349eecb39a9dc1b55eb19899ec7e (commit)
       via  b584c6a7b9ded7f8ec2bba85fd2cd28503beb6cf (commit)
       via  cbc2f436267403c70b1f10a00bf683b64cdf5e3d (commit)
       via  acacc68933c7533e0dce5a0849686cf37dfb7e8b (commit)
      from  3f57c4edb0fa1a5537172683e880365aeb9e7a42 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ccaf7d8e7122349eecb39a9dc1b55eb19899ec7e
Merge: b584c6a 3f57c4e
Author: Aditya Arun <eswara.sriaditya@xxxxxxxxx>
Date:   Sat Mar 14 10:46:38 2015 +0530

    Merge ssh://git.tuxfamily.org/gitroot/qet/documentation
    
    Conflicts:
    	source/locale/it/LC_MESSAGES/QET.po

commit b584c6a7b9ded7f8ec2bba85fd2cd28503beb6cf
Author: Aditya Arun <eswara.sriaditya@xxxxxxxxx>
Date:   Sat Mar 14 10:42:21 2015 +0530

    Fixing up file permission issue with italian po file

commit cbc2f436267403c70b1f10a00bf683b64cdf5e3d
Author: Aditya Arun <eswara.sriaditya@xxxxxxxxx>
Date:   Sat Mar 14 10:32:54 2015 +0530

    Added the missing sphinx-intl configuration in conf.py

commit acacc68933c7533e0dce5a0849686cf37dfb7e8b
Author: Aditya Arun <eswara.sriaditya@xxxxxxxxx>
Date:   Sat Mar 14 07:17:40 2015 +0530

    ---------------- Testing for silvio --------------

-----------------------------------------------------------------------

Summary of changes:
 source/QET.rst  |    4 +-
 source/QET.rst~ |  733 -------------------------------------------------------
 source/conf.py  |    4 +
 source/conf.py~ |    2 +-
 4 files changed, 7 insertions(+), 736 deletions(-)
 delete mode 100644 source/QET.rst~


hooks/post-receive
--
qet/documentation.git