From: Michael Hanke <michael.hanke@gmail.com>
Date: Wed, 1 May 2013 08:06:52 +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=114f90f615e894a952d984be246ef1a3b9b8b901;p=neurodebian.git

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

* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  ENH: 1 more "build-dependency" for the website
  BF: previous monkey-patch doesn't work with elderly backport of sphinx (1.0.7) on squeeze
  ENH: monkey patch regexp for english words -- we need to allow searching package names
  Updated submodules.
---

114f90f615e894a952d984be246ef1a3b9b8b901