Merge remote-tracking branch 'origin/devel-0.13' into multipleauthmethods
authorKostas Papadimitriou <kpap@grnet.gr>
Fri, 30 Nov 2012 13:36:33 +0000 (15:36 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Fri, 30 Nov 2012 13:36:33 +0000 (15:36 +0200)
commite258177785211e979894d417fefbaf65c0ea60aa
treea5ced29dcbd4be22d549f1e501e72cc366d563df
parent2e90e3ece36488e77b6770bbaecc5dafb5517b6e
parent30d92d1e5790d8b55be32855b4be08b949e5ae83
Merge remote-tracking branch 'origin/devel-0.13' into multipleauthmethods