From: Yaroslav Halchenko <debian@onerussian.com>
Date: Mon, 16 May 2011 15:49:37 +0000 (-0400)
Subject: Merge branch 'master' of git://git.debian.org/pkg-exppsy/neurodebian
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5b16d07f96e5d5b11f36d7d5c87189fddda31888;p=neurodebian.git

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

* 'master' of git://git.debian.org/pkg-exppsy/neurodebian:
  Unify time item labels.
  Polish, disable auto-reset for now
---

5b16d07f96e5d5b11f36d7d5c87189fddda31888