Merge remote-tracking branch 'ayke/ayke-image-width-fix'
Merge branch 'master' of github.com:khandhas-infra/kninfra
Merge branch 'master' of https://github.com/karpenoktem/kninfra
Merge branch 'master' of https://github.com/karpenoktem/kninfra
Merge remote-tracking branch 'khandhas/master'
ldap: add sambaNTPassword for wireless auth via FreeRADIUS
Typofix in text
improve upon 1ab18fc
Merge remote-tracking branch 'khandhas/new-slideshow-photos'
Merge branch 'master' of github.com:/karpenoktem/kninfra
New photo 'gala2014'

$ convert ../gala2014.orig.jpg gala2014.icm
$ convert -strip -profile gala2014.icm -crop 797x1063+0+80 -gravity
southwest -fill white -font Helvetica -pointsize 20 -draw "text 0,194 '©
Jules Smeenk'" -interlace Plane -quality 85 ../gala2014.orig.jpg
gala2014.jpg