Shannon f356b94c39 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 ...

Conflicts:
	src/Umbraco.Core/Cache/CacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/Cache/NullCacheProvider.cs
	src/Umbraco.Core/Cache/StaticCacheProvider.cs

2013-09-25 19:09:16 +10:00

..

DateData.cs

Merge remote-tracking branch 'origin/6.2.0' into 7.0.0

2013-09-25 19:09:16 +10:00

DateDataType.cs

obsoleting legacy prop eds

2013-09-25 19:03:05 +10:00

dateField.cs

obsoleting legacy prop eds

2013-09-25 19:03:05 +10:00