From: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed, 24 Apr 2013 16:08:58 +0000 (-0400)
Subject: Merge branch 'master' into newdesign
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=37a6e242c8db60c66b6abac142e969086b163bfa;p=neurodebian.git

Merge branch 'master' into newdesign

* master: (28 commits)
  Placed links to the fresh VM
  cool up a fresh version of VM
  added tigervnc to the list of listed packages
  unfortunately previous ones were not rotated and sphinx is not smart enough
  more coffee art
  Changelog entry for 0.31
  BF: assure that new loglines are appended to existing entry
  old years look stale -- progress forward
  fixing spotted typo
  Adding the entry for upcoming talk
  Update URL of the Magdeburg mirror
  debian/copyright - adjusted for dep5 v1.0. compliance
  testimonial from Dr. Walter
  Quotes from Alexander and Joseph, Thanks!
  added nitrc id for bioimagesuite
  Testimonial from Francisco Pereira
  forgotten tags for Sebastian testimonial
  testimonial from Sebastian
  testimonial from Mathias Goldau
  minor change from Nina
  ...

Conflicts:
	Makefile -- minor
	sphinx/conf.py -- minor
	sphinx/index.rst -- yet to be replicated in moved-to files
	sphinx/vm.rst -- yet to be replicated in moved-to files
---

37a6e242c8db60c66b6abac142e969086b163bfa