| commit | 0be521d6a31441ca083f2f87a15b29b5b129baf4 | |
| author | Tails developers <amnesia@boum.org> | |
| Thu, 12 Apr 2012 09:21:57 +0000 (12 11:21 +0200) | ||
| committer | Tails developers <amnesia@boum.org> | |
| Thu, 12 Apr 2012 09:21:57 +0000 (12 11:21 +0200) | ||
| tree | c48701ef784893dd3e75ebdfe2666d47ea65d8e0 | treesnapshot (tar.gz zip) |
| parent | 91eda8541a035e03126b21bd4d7035c22283c1fe | commitdiff |
| parent | 233b7f232b19ecd6e9bfbc9c240b1e29ac41a43c | commitdiff |
Merge branch 'master' into devel
Conflicts:
wiki/src/todo/persistence.mdwn
Conflicts:
wiki/src/todo/persistence.mdwn
| wiki/src/todo/persistence.mdwn | diff1 | diff2 | blobhistory |