From: Doni Pracner <quinnuendo@gmail.com>
Date: Sat, 15 Feb 2014 18:03:51 +0000 (+0100)
Subject: Merge branch 'master' into public
X-Git-Tag: v14a~8
X-Git-Url: https://svarog.pmf.uns.ac.rs/gitweb/?a=commitdiff_plain;h=5032b8ef31be8b199297901b7fe1ec2c6dccea37;p=spa1skripta-public.git

Merge branch 'master' into public
---

5032b8ef31be8b199297901b7fe1ec2c6dccea37