Merge branch 'master' of git.sour.is:dn42/wiki to a topic branch.

Xuu committed 2015-01-26 15:09:59 -0700 commit 3a9257fbb02ed30e220ac1425f645ff55d78f09f