Merge branch 'devel' of h1dev:/srv/APKPM/
authorDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 23 Mar 2011 21:52:51 +0000 (21:52 +0000)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 23 Mar 2011 21:52:51 +0000 (21:52 +0000)

Trivial merge