Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann
2018-08-28 13:27:04 +02:00
3 changed files with 6 additions and 8 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2011 Max Kellermann <max.kellermann@gmail.com>
* Copyright 2010-2018 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions