diff options
| author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-20 19:47:11 +0000 |
|---|---|---|
| committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-20 19:47:11 +0000 |
| commit | d74a60a6ae450520aa8cb467699d7529f10417a2 (patch) | |
| tree | 6a0d422467ec4830d267d04b66b00f52a4b9dcfc /ChangeLog | |
| parent | eac419a73d6742fa2209f7e775c8624e9d863973 (diff) | |
Merge changes and update .version and ChangeLog files.
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.8.2.2@303104 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,11 @@ +2011-01-20 Leif Madsen <lmadsen@digium.com> + + * Asterisk 1.8.2.2 Released. + + * An improper merge of the changes for AST-2011-011 caused the changes + to not be applied to the 1.8.2.1 tag. The 1.8.2.2 tag contains the + security changes related to AST-2011-001. + 2011-01-17 Leif Madsen <lmadsen@digium.com> * Asterisk 1.8.2.1 Released. |