From: Michael Hanke <michael.hanke@gmail.com>
Date: Tue, 7 Jun 2011 16:42:50 +0000 (-0400)
Subject: Merge branch 'master' of alioth:/git/pkg-exppsy/neurodebian
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5177aca649b20e16f897c62cffd61498b8244598;p=neurodebian.git

Merge branch 'master' of alioth:/git/pkg-exppsy/neurodebian

* 'master' of alioth:/git/pkg-exppsy/neurodebian:
  Let's not put ideas into the visitor's mouth -- remove "under-estimation" claim
  ENH: survey results -- mark later-on added entries with a dagger
  RF+ENH: move commonly useful dict with what entries were added into common.py
  add a quote from Stephan's CV paper
  added XNAT
  more ignores
  pixid has its own package now
---

5177aca649b20e16f897c62cffd61498b8244598