Merge branch 'devel' of h1dev:/srv/APKPM/
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 27 Nov 2011 18:44:20 +0000 (19:44 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 27 Nov 2011 18:44:20 +0000 (19:44 +0100)

Trivial merge