[python-xrayutilities] 01/02: Merge branch 'upstream'

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch master
in repository python-xrayutilities.

commit 144f8c5d8927edaa7e8ae1f58a1d17574a9e9b21
Merge: 823a652 8588492
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Fri Nov 1 12:10:02 2013 +0100

    Merge branch 'upstream'

 CHANGES.txt                                |    9 ++++
 PKG-INFO                                   |   17 ++++---
 README.txt                                 |   15 +++---
 doc/source/conf.py                         |    2 +-
 doc/source/examples.rst                    |   18 +++++++
 doc/xrayutilities.info                     |  Bin 645364 -> 0 bytes
 examples/xrayutilities_experiment_kappa.py |    6 +--
 setup.py                                   |   43 +++++++++++++++--
 xrayutilities.pdf                          |  Bin 591791 -> 599218 bytes
 xrayutilities/analysis/line_cuts3d.py      |    2 +-
 xrayutilities/analysis/sample_align.py     |    8 ++--
 xrayutilities/experiment.py                |    4 +-
 xrayutilities/math/__init__.py             |    5 ++
 xrayutilities/math/fit.py                  |   71 +++++++++++++++++++++-------
 xrayutilities/math/functions.py            |   61 ++++++++++++++++++++++--
 15 files changed, 213 insertions(+), 48 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-xrayutilities.git