From: Michael Hanke <michael.hanke@gmail.com>
Date: Fri, 9 Sep 2011 02:20:18 +0000 (+0200)
Subject: Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=86e633f716390bf952ceb2ff5d42cf5e9f4e1280;p=neurodebian.git

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

* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  adding blend entry for psychlops project
---

86e633f716390bf952ceb2ff5d42cf5e9f4e1280