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 81a333b,1065eb9..b6e5f90
--- 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,6 +92,12 @@@ using System.Windows
  //
  // You can specify all the values or you can default the Build and Revision Numbers 
  // by using the '*' as shown below:
 -// [assembly: AssemblyVersion("1.0.*")]\r
 -[assembly: AssemblyVersion("0.7.20430.0")]\r
++<<<<<<< HEAD
 +// [assembly: AssemblyVersion("1.0.*")]
 +[assembly: AssemblyVersion("0.7.20427.0")]
 +[assembly: AssemblyFileVersionAttribute("0.7.20427.0")]
++=======
++// [assembly: AssemblyVersion("1.0.*")]
++[assembly: AssemblyVersion("0.7.20430.0")]
+ [assembly: AssemblyFileVersionAttribute("0.7.20430.0")]
++>>>>>>> 1865ad904d16c957b461d4f539cd762dfaf29dae