From: Doni Pracner <quinnuendo@gmail.com>
Date: Fri, 18 Jul 2014 18:45:18 +0000 (+0200)
Subject: Merge branch 'master' into work
X-Git-Tag: v0.1.8~1^2~9
X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=commitdiff_plain;h=5ec7c0162c03b3229de5dd9bb5264b8f76ff695e;hp=-c

Merge branch 'master' into work
---

5ec7c0162c03b3229de5dd9bb5264b8f76ff695e