Updated cross-compile instructions
Merge branch 'update-crosscompile-instructions' of https://github.com/nurupo/InsertProjectNameHere
Added some checks to mutex related functions.
ifdef out use of linux/limts.h in test_avatars

This fixes building on OS X and other systems whose limits.hs have PATH_MAX.
Merge branch 'stal888-patch-1'
Merge branch 'master' into debian/unstable
prepare for release
Merge branch 'debian/unstable' into debian/stable
prepare for release