Merge branch 'master' of ssh://codewiz.org/git/bernie/wizbackup
authorSugar Labs BOFH <sysadmin@sugarlabs.org>
Sun, 17 May 2015 05:40:58 +0000 (01:40 -0400)
committerSugar Labs BOFH <sysadmin@sugarlabs.org>
Sun, 17 May 2015 05:40:58 +0000 (01:40 -0400)
commit1b809305fba27877226fe2de759cf9dc889b4b07
treef50a3ef873e4d0f7331af5f10a664088e9a4ba87
parent7c061b438673833744dc9c3db70ed82d1d5c00db
parent8719e5cb6026c9242473d392e6dec250fb849551
Merge branch 'master' of ssh://codewiz.org/git/bernie/wizbackup

Conflicts:
wizbackup
wizbackup