]> git.donarmstrong.com Git - neurodebian.git/commit
Merge branch 'master' of git://git.debian.org/git/pkg-exppsy/neurodebian
authorYaroslav Halchenko <debian@onerussian.com>
Thu, 19 May 2011 20:38:23 +0000 (16:38 -0400)
committerYaroslav Halchenko <debian@onerussian.com>
Thu, 19 May 2011 20:38:23 +0000 (16:38 -0400)
commitc5e6c9ca5fc63b729547572f366459040b30bdeb
treeb3ef24ea07faaaeb25a621711ddf0d66c2c27392
parent02f761814bf5a60203ae131a06b5986e48ae1ce1
parentadf3f7db811bac98f8fe28efa1252ade6bf035a8
Merge branch 'master' of git://git.debian.org/git/pkg-exppsy/neurodebian

* 'master' of git://git.debian.org/git/pkg-exppsy/neurodebian:
  Add Superlab.

Conflicts:
survey/survey.rst  -- cogent vs superlab
survey/survey.rst