diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
|---|---|---|
| committer | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
| commit | 4f9313b1de21a03df32bfba4d94207c78a2171b0 (patch) | |
| tree | 6a637dd4dde653f870346a37ec6555eb0574949a /manifest.uuid | |
| parent | 9da5e9acd37e51b86429d938e7e6a64ffb02da84 (diff) | |
| parent | 1b5ba8e022836fa8ab93bc90df1b34a29ea6e134 (diff) | |
Merge tag 'upstream/2.1.1'
Upstream version 2.1.1
Conflicts:
.gitignore
Diffstat (limited to 'manifest.uuid')
| -rw-r--r-- | manifest.uuid | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifest.uuid b/manifest.uuid index c6eb164..f808cb0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6d326d44fd1d626aae0e8456e5fa2049f1ce0789 +091570e46d04e84b67228e0bdbcd6e1fb60c6bdb |