Merge branch 'devel' of h1dev:/srv/APKPM/
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 14 Apr 2012 18:28:26 +0000 (20:28 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 14 Apr 2012 18:28:26 +0000 (20:28 +0200)

Trivial merge