Merge branch 'upstream/master'
ConsoleApplication1
npgsql 2.0.14 compatibility
-
Merge branch 'ilshat/master'

Conflicts:
	WpfApplication1/MainWindow.xaml.cs