Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
	dist/css/bootstrap.min.css

1 files changed, 4 insertions, 4 deletions

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index ba4966f9f..f806e89e4 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2219,7 +2219,7 @@ input[type="button"].btn-block {
 .dropdown-menu > .disabled > a:hover,
 .dropdown-menu > .disabled > a:focus {
   text-decoration: none;
-  cursor: default;
+  cursor: not-allowed;
   background-color: transparent;
   background-image: none;
   filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
@@ -2540,7 +2540,7 @@ button.close {
 .nav > li.disabled > a:focus {
   color: #999999;
   text-decoration: none;
-  cursor: default;
+  cursor: not-allowed;
   background-color: transparent;
 }
 
@@ -3316,7 +3316,7 @@ button.close {
 .pagination > .disabled > a:hover,
 .pagination > .disabled > a:focus {
   color: #999999;
-  cursor: default;
+  cursor: not-allowed;
   background-color: #ffffff;
 }
 
@@ -3417,7 +3417,7 @@ button.close {
 .pager .disabled > a:focus,
 .pager .disabled > span {
   color: #999999;
-  cursor: default;
+  cursor: not-allowed;
   background-color: #ffffff;
 }