Merge branch 'aescrypt'
Conflicts:
www-apps/pmwiki/cookbook/AesCrypt/attic/aescrypt.00.php
www-apps/pmwiki/cookbook/AesCrypt/submodal/close.gif
www-apps/pmwiki/cookbook/AesCrypt/submodal/common.js
www-apps/pmwiki/cookbook/AesCrypt/submodal/dialog.html
www-apps/pmwiki/cookbook/AesCrypt/submodal/index.php
www-apps/pmwiki/cookbook/AesCrypt/submodal/loading.html
www-apps/pmwiki/cookbook/AesCrypt/submodal/style.css
www-apps/pmwiki/cookbook/AesCrypt/submodal/subModal.css
www-apps/pmwiki/cookbook/AesCrypt/submodal/subModal.js