Merge branch 'devel-0.13' into multipleauthmethods
[astakos] / config
2012-11-14 Olga BraniTemp commit to switch to new branch ( based on dcd1c383...