Merge branch 'master' into devel
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 15 Mar 2011 18:35:59 +0000 (19:35 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 15 Mar 2011 18:35:59 +0000 (19:35 +0100)

Trivial merge