From: Michael Hanke <michael.hanke@gmail.com>
Date: Thu, 9 Feb 2012 20:01:50 +0000 (+0100)
Subject: Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4c3f3d31f12dde512f5d2cc1056d0263727f29e4;p=neurodebian.git

Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian

* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  minor phrasing
  Added my talk at UPENN
---

4c3f3d31f12dde512f5d2cc1056d0263727f29e4