Merge remote-tracking branch 'mjesec/master'
authorDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 22 Jan 2014 16:22:19 +0000 (17:22 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 22 Jan 2014 16:22:19 +0000 (17:22 +0100)

Trivial merge