Merge branch 'master' into doc/trail
Conflicts: wiki/src/doc.es.po wiki/src/doc.pt.po wiki/src/index.pt.po
This diff is collapsed.
wiki/src/akuckartz.mdwn
0 → 100644
Conflicts: wiki/src/doc.es.po wiki/src/doc.pt.po wiki/src/index.pt.po