Merge branch 'devel' of h1dev:/srv/APKPM/
authorDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 18 Mar 2011 18:37:35 +0000 (18:37 +0000)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 18 Mar 2011 18:37:35 +0000 (18:37 +0000)

Trivial merge