Merge branch 'devel' of h1dev:/srv/APKPM/
authorDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 13 Apr 2011 09:23:32 +0000 (09:23 +0000)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 13 Apr 2011 09:23:32 +0000 (09:23 +0000)

Trivial merge