Merge branch 'devel' of h1dev:/srv/APKPM/ master
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 20 May 2012 23:02:14 +0000 (01:02 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 20 May 2012 23:02:14 +0000 (01:02 +0200)

Trivial merge