zamentur ea5ffb8498 Merge remote-tracking branch 'upstream/unstable' into unstable ... Conflicts: data/hooks/restore/05-conf_ldap		2016-02-08 22:52:28 +01:00
..
backup	Merge remote-tracking branch 'upstream/unstable' into unstable	2016-02-08 22:52:28 +01:00
conf_regen	[fix] Remove udisks-glue from conf_regen and services	2016-01-27 23:40:38 +01:00
post_backup_create	[enh] Bind folders in data backup hooks instead of copying them	2015-10-03 00:59:19 +02:00
restore	Merge remote-tracking branch 'upstream/unstable' into unstable	2016-02-08 22:52:28 +01:00