Merge branch 'master' into testing testing
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 18 Jan 2011 16:33:38 +0000 (17:33 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 18 Jan 2011 16:33:38 +0000 (17:33 +0100)

Trivial merge