Merge branch 'v2.5' into monoorigin/mono

Conflicts:
	src/DotNetOpenId/Properties/AssemblyInfo.cs
	src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs

1 files changed, 0 insertions, 12 deletions

diff --git a/samples/ProviderCustomStore/CustomStoreDataSet.xss b/samples/ProviderCustomStore/CustomStoreDataSet.xss
deleted file mode 100644
index d097e67..0000000
--- a/samples/ProviderCustomStore/CustomStoreDataSet.xss
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--<autogenerated>

-     This code was generated by a tool to store the dataset designer's layout information.

-     Changes to this file may cause incorrect behavior and will be lost if

-     the code is regenerated.

-</autogenerated>-->

-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">

-  <Shapes>

-    <Shape ID="DesignTable:Association" ZOrder="1" X="349" Y="83" Height="105" Width="154" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />

-  </Shapes>

-  <Connectors />

-</DiagramLayout>
\ No newline at end of file