From: Michael Hanke <michael.hanke@gmail.com>
Date: Fri, 9 Mar 2012 16:45:53 +0000 (+0100)
Subject: Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5e715bd5d8ccab81684eb14b94df9d45396f63ea;p=neurodebian.git

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

* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  FIX: oops - I did it again
  Added [ua] mirror
  Live image page: installation instructions, version history, added screenshot; derivatives page: added NeuroDebian packages included (2nd try)
  Live image page: installation instructions, version history, added screenshot; derivatives page: added NeuroDebian packages included
  oopsy -- fixing what should have not been committed
  Added a basic icon for derivatives page
---

5e715bd5d8ccab81684eb14b94df9d45396f63ea