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

* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  1 fresh pic from swaroop
  injected entry for PyMEG
  minor from a drunken mind

diff --git a/future/blends/pymeg b/future/blends/pymeg
new file mode 100644 (file)
index 0000000..aa20147
--- /dev/null
+++ b/future/blends/pymeg
@@ -0,0 +1,15 @@
+Source: pymeg
+Tasks: debian-science/electrophysiology,
+          debian-med/imaging
+Homepage: https://github.com/badbytes/pymeg/wiki
+Author: Dan Collins <quaninux@gmail.com>
+Language: Python
+License: GPL-3
+Version: unknown
+Pkg-Description: suite for analysis of magnetoencephalography (MEG) data
+  PyMEG is a project in Python to do various neuroimaging processing
+  with magnetoencephalography (MEG) data. The purpose of this project,
+  is to create a suite of functions to do MEG analysis in Python.
+Remark: Needs DFSG-ification.
+        According to the author is not yet ready for the use by
+        mortals -- wasn't released yet.

diff --git a/sphinx/coffeeart.rst b/sphinx/coffeeart.rst
index 6b809293f5153422f6a948d338dae3127c0ec22c..03bcc2ba69a037b80e533a7fe9652499e00538d9 100644 (file)
--- a/sphinx/coffeeart.rst
+++ b/sphinx/coffeeart.rst
@@ -8,6 +8,10 @@
 Coffee Art
 **********
 
+2011-09-01 18.48.53
+-------------------
+
+.. figure:: /pics/coffeeart/2011-09-01_18.48.53.jpg
 
 2011-08-25 00:00:00
 -------------------

diff --git a/sphinx/pics/coffeeart/2011-09-01_18.48.53.jpg b/sphinx/pics/coffeeart/2011-09-01_18.48.53.jpg
new file mode 100644 (file)
index 0000000..a73b8bc
Binary files /dev/null and b/sphinx/pics/coffeeart/2011-09-01_18.48.53.jpg differ