Merge remote branch 'upstream/master'

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2011 by Nicolas Petton <petton.nicolas@gmail.com>
+Copyright (C) 2011 Nicolas Petton <petton.nicolas@gmail.com>
 Copyright (C) 2011 Amber contributors https://github.com/NicolasPetton/amber/contributors
 
 Parts of Amber take ideas from Clamato (http://clamato.net), written by Avi Bryant.