Merge branch 'devel' of h1dev:/srv/APKPM/
authorDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 28 Nov 2011 12:41:14 +0000 (13:41 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 28 Nov 2011 12:41:14 +0000 (13:41 +0100)

Trivial merge