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

Trivial merge