Merge branch 'app'
authorDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 15 Nov 2010 20:03:13 +0000 (21:03 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 15 Nov 2010 20:03:13 +0000 (21:03 +0100)

Trivial merge