Merge remote-tracking branch 'mjesec/master'
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 3 Jan 2015 21:48:03 +0000 (22:48 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 3 Jan 2015 21:48:03 +0000 (22:48 +0100)

Trivial merge