From 1be8dc112568c96bca1ffd50283dc3e08e208677 Mon Sep 17 00:00:00 2001
From: "zaitsev.serge" <zaitsev.serge@cec141ff-132a-4243-88a5-ce187bd62f94>
Date: Fri, 5 Dec 2014 21:53:50 +0000
Subject: [PATCH] Merge branch 'master' of git://github.com/zserge/zs

git-svn-id: file:///srv/svn/repo/aya/trunk@11 cec141ff-132a-4243-88a5-ce187bd62f94