Merge branch '0.12.1'
diff --git a/lib/csharp/src/Thrift.csproj b/lib/csharp/src/Thrift.csproj
index 0a1552f..a1a37ae 100644
--- a/lib/csharp/src/Thrift.csproj
+++ b/lib/csharp/src/Thrift.csproj
@@ -154,4 +154,4 @@
<ProjectExtensions>
<VisualStudio AllowExistingFolder="true" />
</ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/hs/Makefile.am b/lib/hs/Makefile.am
index 3cd8b57..ba156a1 100644
--- a/lib/hs/Makefile.am
+++ b/lib/hs/Makefile.am
@@ -39,6 +39,9 @@
clean-local:
$(CABAL) clean
+dist-local:
+ $(CABAL) sdist
+
maintainer-clean-local:
$(CABAL) clean
diff --git a/lib/hs/thrift.cabal b/lib/hs/thrift.cabal
index 0849b80..dd30d89 100644
--- a/lib/hs/thrift.cabal
+++ b/lib/hs/thrift.cabal
@@ -20,7 +20,7 @@
Name: thrift
Version: 0.13.0
Cabal-Version: 1.24
-License: OtherLicense
+License: Apache
Category: Foreign
Build-Type: Simple
Synopsis: Haskell bindings for the Apache Thrift RPC system
diff --git a/lib/rs/README.md b/lib/rs/README.md
index c8d3643..f518f4e 100644
--- a/lib/rs/README.md
+++ b/lib/rs/README.md
@@ -47,6 +47,7 @@
Breaking changes are minimized. When they are made they will be outlined below with transition guidelines.
##### Thrift 0.13.0
+
* **[THRIFT-4536]** - Use TryFrom from std, required rust 1.34.0 or higher
Previously TryFrom was from try_from crate, it is now from the std library,