Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client

Conflicts:
	trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs

Signed-off-by: George Pantazis <gpant@noc.grnet.gr>

diff --cc trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
index 826915d,4b15f49..a040480
--- 1/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
--- 2/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
+++ b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
@@@ -92,6 -92,5 +92,9 @@@ using System.Windows
  //
  // You can specify all the values or you can default the Build and Revision Numbers 
  // by using the '*' as shown below:
++<<<<<<< HEAD
 +// [assembly: AssemblyVersion("1.0.*")]
++=======
++>>>>>>> 2b0ec5b83deb6c61ffae7943da4606733b0f5e76
  [assembly: AssemblyVersion("0.7.20430.0")]
  [assembly: AssemblyFileVersionAttribute("0.7.20430.0")]