]> git.donarmstrong.com Git - neurodebian.git/commitdiff
projects / neurodebian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87a4585 9e17324)
Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian
authorMichael Hanke <michael.hanke@gmail.com>
Thu, 9 Feb 2012 20:01:50 +0000 (21:01 +0100)
committerMichael Hanke <michael.hanke@gmail.com>
Thu, 9 Feb 2012 20:01:50 +0000 (21:01 +0100)
* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  minor phrasing
  Added my talk at UPENN


Trivial merge
This is a branch of the neurodebian git repository; upstream is here: git://anonscm.debian.org/pkg-exppsy/neurodebian.git