From: alla <Alla.Maevskaya@cern.ch>
Date: Wed, 12 Nov 2014 08:34:35 +0000 (+0400)
Subject: Merge branch 'master_patch'
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=af468deb14520513af31ef6e597a003d930253ec

Merge branch 'master_patch'
---

af468deb14520513af31ef6e597a003d930253ec