]> git.donarmstrong.com Git - neurodebian.git/commit
Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian
authorMichael Hanke <michael.hanke@gmail.com>
Fri, 2 Sep 2011 06:38:30 +0000 (08:38 +0200)
committerMichael Hanke <michael.hanke@gmail.com>
Fri, 2 Sep 2011 06:38:30 +0000 (08:38 +0200)
commit58e1fa3b4810f36b21a61f5a2e27e8f2244a8787
treec50abae1c530141986f968a0dc1351b1cee414d3
parent856dd7d1998556f536b50a186b38c60363b2c590
parent72b5e4756bca73ec8b01e38fcbccb7fc81a0c456
Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian

* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  1 fresh pic from swaroop
  injected entry for PyMEG
  minor from a drunken mind