diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-05-02 15:32:49 -0300 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-02 15:32:49 -0300 |
| commit | cff2db0f2424dd47a60ce21c0ca42017bb1b709d (patch) | |
| tree | b8de4e471e4f77f235a2d4b4fc52b6620c59be4d /doc/thanks.mdwn | |
| parent | f11dd1f77292d6a5eee3da9415a99e75c5da4e78 (diff) | |
| parent | 10a3d627dcb23035bc68c9912e927288be493d8e (diff) | |
Merge branch 'master' into bootstrap3
Conflicts:
debian/changelog
Diffstat (limited to 'doc/thanks.mdwn')
| -rw-r--r-- | doc/thanks.mdwn | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/thanks.mdwn b/doc/thanks.mdwn index 8959342b5..6948e4512 100644 --- a/doc/thanks.mdwn +++ b/doc/thanks.mdwn @@ -124,9 +124,10 @@ Poobalasubramanian, Alexandre Garel, David Clark, Jeff Johnson, Mica Semrick, Paul Staab, Rémi Vanicat, Martin Holtschneider, Jan Ivar Beddari, Peter Simons, Thomas Koch, Justin Geibel, Guillaume DELVIT, Shanti Bouchez, Oliver Brandt, François Deppierraz, Chad Walstrom, Tim Mattison, -Jakub Antoni Tyszko, and 30 anonymous bitcoin users +Jakub Antoni Tyszko, Casa do Boneco, and 30 anonymous bitcoin users -With an especial thanks to the WikiMedia foundation. +With an especial thanks to the WikiMedia foundation, +and Rede Mocambos. ## 2012-2013 |