gllmflndn/ni-dm — pull request #2 by cmaumet (2013-12-10 12:08:26+00:00)
Title: Rebasing according to ni-/ni-dm and remove statistical_estimation activity

Please choose between this PR ( #2 ) and PR #3.

This pull request fixes the merge conflicts with ni-/ni-dm and **remove the statistical_estimation activity** (see PR #3 to keep this activity).

If you accept this Pull Request, we will then be able to automatically merge your changes into the main ni-/ni-dm repository.