From: Michael Hanke <michael.hanke@gmail.com>
Date: Sun, 23 Sep 2012 19:10:34 +0000 (+0200)
Subject: Merge branch 'master' into newdesign
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b1ec2424c047b7ce64fb66b581892ace973b733a;p=neurodebian.git

Merge branch 'master' into newdesign

* master:
  injected spykeview
  BF: added an alias for neo (python-neo)
---

b1ec2424c047b7ce64fb66b581892ace973b733a