Merge branch 'feature/incremental-upgrades' into devel
commitf049a80732408530d090eecb4092aee2a4eaf2fd
authorTails developers <amnesia@boum.org>
Fri, 29 Nov 2013 11:48:32 +0000 (29 12:48 +0100)
committerTails developers <amnesia@boum.org>
Fri, 29 Nov 2013 11:48:32 +0000 (29 12:48 +0100)
treed5125bb47f298d97b89ecbe4fd8f7ca803cd7713
parent697f9018b977d479e8b7ff06408fa3042988907a
parentba46332171033f3a90ef92c3dbbc9c6447bc1e73
Merge branch 'feature/incremental-upgrades' into devel